Fixed compilation with microhttpd >= 0.9.2

[psensor.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index cdf2baa..b00f8ae 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -38,10 +38,7 @@
 
 #ifdef HAVE_GTOP
 #include "sysinfo.h"
-#endif
-
-#ifdef HAVE_LUA
-#include "server_lua.h"
+#include "cpu.h"
 #endif
 
 #include "psensor_json.h"
@@ -113,19 +110,6 @@ void print_help()
 }
 
 /*
-  Returns '1' if the path denotates a Lua file, otherwise returns 0.
- */
-int is_path_lua(const char *path)
-{
-       char *dot = rindex(path, '.');
-
-       if (dot && !strcasecmp(dot, ".lua"))
-               return 1;
-
-       return 0;
-}
-
-/*
   Returns the file path corresponding to a given URL
 */
 char *get_path(const char *url, const char *www_dir)
@@ -134,7 +118,7 @@ char *get_path(const char *url, const char *www_dir)
        char *res;
 
        if (!strlen(url) || !strcmp(url, ".") || !strcmp(url, "/"))
-               p = "/index.lua";
+               p = "/index.html";
        else
                p = url;
 
@@ -146,8 +130,13 @@ char *get_path(const char *url, const char *www_dir)
        return res;
 }
 
+#if MHD_VERSION >= 0x00090200
+static int
+file_reader(void *cls, uint64_t pos, char *buf, size_t max)
+#else
 static int
 file_reader(void *cls, uint64_t pos, char *buf, int max)
+#endif
 {
        FILE *file = cls;
 
@@ -172,6 +161,8 @@ create_response_api(const char *nurl,
        } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
 
                page = sysinfo_to_json_string(&server_data.psysinfo);
+       } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
+               page = sensor_to_json_string(server_data.cpu_usage);
 #endif
        } else if (!strncmp(nurl, URL_BASE_API_1_0_SENSORS,
                            strlen(URL_BASE_API_1_0_SENSORS))
@@ -207,26 +198,6 @@ create_response_api(const char *nurl,
 }
 
 struct MHD_Response *
-create_response_lua(const char *nurl,
-                   const char *method,
-                   unsigned int *rp_code,
-                   const char *fpath)
-{
-#ifdef HAVE_LUA
-       char *page = lua_to_html_page(&server_data, fpath);
-
-       if (page) {
-               *rp_code = MHD_HTTP_OK;
-
-               return MHD_create_response_from_data
-                       (strlen(page), page, MHD_YES, MHD_NO);
-       }
-#endif
-
-       return NULL;
-}
-
-struct MHD_Response *
 create_response_file(const char *nurl,
                     const char *method,
                     unsigned int *rp_code,
@@ -270,12 +241,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
        } else {
                char *fpath = get_path(nurl, server_data.www_dir);
 
-               if (is_path_lua(fpath))
-                       resp = create_response_lua
-                               (nurl, method, rp_code, fpath);
-               else
-                       resp = create_response_file
-                               (nurl, method, rp_code, fpath);
+               resp = create_response_file(nurl, method, rp_code, fpath);
 
                free(fpath);
        }
@@ -305,7 +271,6 @@ cbk_http_request(void *cls,
        int ret;
        char *nurl;
        unsigned int resp_code;
-       char *page = NULL;
 
        if (strcmp(method, "GET"))
                return MHD_NO;
@@ -390,12 +355,13 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       if (!lmsensor_init()) {
-               fprintf(stderr, _("ERROR: failed to init lm-sensors\n"));
-               exit(EXIT_FAILURE);
-       }
+       psensor_init();
+
+       server_data.sensors = get_all_sensors(600);
 
-       server_data.sensors = get_all_sensors(1);
+#ifdef HAVE_GTOP
+       server_data.cpu_usage = create_cpu_usage_sensor(600);
+#endif
 
        if (!*server_data.sensors)
                fprintf(stderr, _("ERROR: no sensors detected\n"));
@@ -418,6 +384,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_GTOP
                sysinfo_update(&server_data.psysinfo);
+               cpu_usage_sensor_update(server_data.cpu_usage);
 #endif
                psensor_list_update_measures(server_data.sensors);
 
@@ -429,11 +396,15 @@ int main(int argc, char *argv[])
 
        /* sanity cleanup for valgrind */
        psensor_list_free(server_data.sensors);
+#ifdef HAVE_GTOP
+       psensor_free(server_data.cpu_usage);
+#endif
        free(server_data.www_dir);
        sensors_cleanup();
 
 #ifdef HAVE_GTOP
        sysinfo_cleanup();
+       cpu_cleanup();
 #endif
 
        return EXIT_SUCCESS;