Add http server (#871)

include/http_server.h

@@ -0,0 +1,22 @@
+/**
+ * RESTful HTTP control and WS interface
+ *
+ * Copyright (C) 2018 Christian Zuckschwerdt
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef INCLUDE_HTTP_SERVER_H_
+#define INCLUDE_HTTP_SERVER_H_
+
+#include "data.h"
+
+struct mg_mgr;
+struct r_cfg;
+
+struct data_output *data_output_http_create(struct mg_mgr *mgr, const char *host, const char *port, struct r_cfg *cfg);
+
+#endif /* INCLUDE_HTTP_SERVER_H_ */

include/r_api.h

@@ -79,6 +79,8 @@ void add_influx_output(struct r_cfg *cfg, char *param);
 
 void add_syslog_output(struct r_cfg *cfg, char *param);
 
+void add_http_output(struct r_cfg *cfg, char *param);
+
 void add_null_output(struct r_cfg *cfg, char *param);
 
 void start_outputs(struct r_cfg *cfg, char const **well_known);

src/CMakeLists.txt

@@ -15,6 +15,7 @@ add_library(r_433 STATIC
     data.c
     decoder_util.c
     fileformat.c
+    http_server.c
     jsmn.c
     list.c
     mongoose.c
@@ -197,7 +198,7 @@ if(MSVC)
     target_sources(rtl_433 PRIVATE getopt/getopt.c)
 endif()
 
-add_library(data data.c abuf.c term_ctl.c mongoose.c)
+add_library(data data.c abuf.c term_ctl.c)
 target_link_libraries(data ${NET_LIBRARIES})
 
 target_link_libraries(rtl_433

src/Makefile.am

@@ -13,6 +13,7 @@ rtl_433_SOURCES      = abuf.c \
                        data.c \
                        decoder_util.c \
                        fileformat.c \
+                       http_server.c \
                        jsmn.c \
                        list.c \
                        mongoose.c \

src/r_api.c

@@ -33,6 +33,7 @@
 #include "mongoose.h"
 #include "compat_time.h"
 #include "fatal.h"
+#include "http_server.h"
 
 #ifdef _WIN32
 #include <io.h>
@@ -921,6 +922,16 @@ void add_syslog_output(r_cfg_t *cfg, char *param)
     list_push(&cfg->output_handler, data_output_syslog_create(host, port));
 }
 
+void add_http_output(r_cfg_t *cfg, char *param)
+{
+    char *host = "0.0.0.0";
+    char *port = "8433";
+    hostport_param(param, &host, &port);
+    fprintf(stderr, "HTTP server at %s port %s\n", host, port);
+
+    list_push(&cfg->output_handler, data_output_http_create(get_mgr(cfg), host, port, cfg));
+}
+
 void add_null_output(r_cfg_t *cfg, char *param)
 {
     UNUSED(param);

src/rtl_433.c

@@ -1028,6 +1028,9 @@ static void parse_conf_option(r_cfg_t *cfg, int opt, char *arg)
         else if (strncmp(arg, "syslog", 6) == 0) {
             add_syslog_output(cfg, arg_param(arg));
         }
+        else if (strncmp(optarg, "http", 4) == 0) {
+            add_http_output(cfg, arg_param(optarg));
+        }
         else if (strncmp(arg, "null", 4) == 0) {
             add_null_output(cfg, arg_param(arg));
         }

vs15/rtl_433.vcxproj

@@ -105,6 +105,7 @@ COPY ..\..\libusb\MS64\dll\libusb*.dll $(TargetDir)</Command>
     <ClInclude Include="..\include\decoder_util.h" />
     <ClInclude Include="..\include\fatal.h" />
     <ClInclude Include="..\include\fileformat.h" />
+    <ClInclude Include="..\include\http_server.h" />
     <ClInclude Include="..\include\jsmn.h" />
     <ClInclude Include="..\include\list.h" />
     <ClInclude Include="..\include\mongoose.h" />
@@ -140,6 +141,7 @@ COPY ..\..\libusb\MS64\dll\libusb*.dll $(TargetDir)</Command>
     <ClCompile Include="..\src\data.c" />
     <ClCompile Include="..\src\decoder_util.c" />
     <ClCompile Include="..\src\fileformat.c" />
+    <ClCompile Include="..\src\http_server.c" />
     <ClCompile Include="..\src\jsmn.c" />
     <ClCompile Include="..\src\list.c" />
     <ClCompile Include="..\src\mongoose.c" />

vs15/rtl_433.vcxproj.filters

@@ -53,6 +53,9 @@
     <ClInclude Include="..\include\fileformat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\http_server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\jsmn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -148,6 +151,9 @@
     <ClCompile Include="..\src\fileformat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\http_server.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\jsmn.c">
       <Filter>Source Files</Filter>
     </ClCompile>