X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=95998c8deb916813798042df837170f2600170c4;hp=bdb785c80f8ceb28a78941a201e5ac17e6d4c2b1;hb=8b10426dcc0246c1712a99460dd470dcb1cc4d9c;hpb=2fa208c5e8aeb318821edc100b240e773fbee954 diff --git a/src/server/server.c b/src/server/server.c index bdb785c..95998c8 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ +#define _LARGEFILE_SOURCE 1 +#include "config.h" + #include #include #define _(str) gettext(str) -#include "config.h" - +#include #include #include #include @@ -38,11 +40,14 @@ #ifdef HAVE_GTOP #include "sysinfo.h" -#include "cpu.h" +#include #endif -#include "log.h" +#include +#include +#include #include "psensor_json.h" +#include #include "url.h" #include "server.h" #include "slog.h" @@ -60,23 +65,24 @@ static const int DEFAULT_PORT = 3131; "Page not found - Go to Main page

")) static struct option long_options[] = { - {"version", no_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"port", required_argument, 0, 'p'}, - {"wdir", required_argument, 0, 'w'}, - {"debug", required_argument, 0, 'd'}, - {"log-file", required_argument, 0, 'l'}, - {"sensor-log-file", required_argument, 0, 0}, - {0, 0, 0, 0} + {"version", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"port", required_argument, NULL, 'p'}, + {"wdir", required_argument, NULL, 'w'}, + {"debug", required_argument, NULL, 'd'}, + {"log-file", required_argument, NULL, 'l'}, + {"sensor-log-file", required_argument, NULL, 0}, + {"sensor-log-interval", required_argument, NULL, 0}, + {NULL, 0, NULL, 0} }; static struct server_data server_data; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex; static int server_stop_requested; -static void print_version() +static void print_version(void) { printf("psensor-server %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -87,7 +93,7 @@ static void print_version() "2010-2012"); } -static void print_help() +static void print_help(void) { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -108,6 +114,8 @@ static void print_help() "set the debug level, integer between 0 and 3")); puts(_(" -l, --log-file=PATH set the log file to PATH")); puts(_(" --sensor-log-file=PATH set the sensor log file to PATH")); + puts(_(" --sensor-log-interval=S " + "set the sensor log interval to S (seconds)")); puts(""); printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT); @@ -146,7 +154,7 @@ file_reader(void *cls, uint64_t pos, char *buf, int max) { FILE *file = cls; - fseek(file, pos, SEEK_SET); + fseeko(file, pos, SEEK_SET); return fread(buf, 1, max, file); } @@ -157,26 +165,26 @@ create_response_api(const char *nurl, const char *method, unsigned int *rp_code) struct psensor *s; char *page = NULL; - if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) { + if (!strcmp(nurl, URL_BASE_API_1_1_SENSORS)) { page = sensors_to_json_string(server_data.sensors); #ifdef HAVE_GTOP - } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) { + } else if (!strcmp(nurl, URL_API_1_1_SYSINFO)) { page = sysinfo_to_json_string(&server_data.psysinfo); - } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) { + } else if (!strcmp(nurl, URL_API_1_1_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)) - && nurl[strlen(URL_BASE_API_1_0_SENSORS)] == '/') { + } else if (!strncmp(nurl, URL_BASE_API_1_1_SENSORS, + strlen(URL_BASE_API_1_1_SENSORS)) + && nurl[strlen(URL_BASE_API_1_1_SENSORS)] == '/') { - const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1; + const char *sid = nurl + strlen(URL_BASE_API_1_1_SENSORS) + 1; s = psensor_list_get_by_id(server_data.sensors, sid); if (s) page = sensor_to_json_string(s); - } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) { + } else if (!strcmp(nurl, URL_API_1_1_SERVER_STOP)) { server_stop_requested = 1; page = strdup(HTML_STOP_REQUESTED); @@ -238,27 +246,39 @@ static struct MHD_Response *create_response_file(const char *nurl, static struct MHD_Response * create_response(const char *nurl, const char *method, unsigned int *rp_code) { + char *page, *fpath, *rpath; struct MHD_Response *resp = NULL; + int n; - if (!strncmp(nurl, URL_BASE_API_1_0, strlen(URL_BASE_API_1_0))) { + if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) { resp = create_response_api(nurl, method, rp_code); } else { - char *fpath = get_path(nurl, server_data.www_dir); - - resp = create_response_file(nurl, method, rp_code, fpath); + fpath = get_path(nurl, server_data.www_dir); + + rpath = realpath(fpath, NULL); + if (rpath) { + n = strlen(server_data.www_dir); + if (!strncmp(server_data.www_dir, rpath, n)) + resp = create_response_file(nurl, + method, + rp_code, + fpath); + free(rpath); + } free(fpath); } - if (resp) { + if (resp) return resp; - } else { - char *page = strdup(PAGE_NOT_FOUND); - *rp_code = MHD_HTTP_NOT_FOUND; - return MHD_create_response_from_data - (strlen(page), page, MHD_YES, MHD_NO); - } + page = strdup(PAGE_NOT_FOUND); + *rp_code = MHD_HTTP_NOT_FOUND; + + return MHD_create_response_from_data(strlen(page), + page, + MHD_YES, + MHD_NO); } static int cbk_http_request(void *cls, @@ -267,7 +287,8 @@ static int cbk_http_request(void *cls, const char *method, const char *version, const char *upload_data, - size_t *upload_data_size, void **ptr) + size_t *upload_data_size, + void **ptr) { static int dummy; struct MHD_Response *response; @@ -294,9 +315,9 @@ static int cbk_http_request(void *cls, nurl = url_normalize(url); - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); response = create_response(nurl, method, &resp_code); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); ret = MHD_queue_response(connection, resp_code, response); MHD_destroy_response(response); @@ -309,7 +330,7 @@ static int cbk_http_request(void *cls, int main(int argc, char *argv[]) { struct MHD_Daemon *d; - int port, opti, optc, cmdok; + int port, opti, optc, cmdok, ret, slog_interval; char *log_file, *slog_file; program_name = argv[0]; @@ -322,9 +343,12 @@ int main(int argc, char *argv[]) #endif server_data.www_dir = NULL; +#ifdef HAVE_GTOP server_data.psysinfo.interfaces = NULL; +#endif log_file = NULL; slog_file = NULL; + slog_interval = 300; port = DEFAULT_PORT; cmdok = 1; @@ -336,7 +360,7 @@ int main(int argc, char *argv[]) switch (optc) { case 'w': if (optarg) - server_data.www_dir = strdup(optarg); + server_data.www_dir = realpath(optarg, NULL); break; case 'p': if (optarg) @@ -359,6 +383,9 @@ int main(int argc, char *argv[]) case 0: if (!strcmp(long_options[opti].name, "sensor-log-file")) slog_file = strdup(optarg); + else if (!strcmp(long_options[opti].name, + "sensor-log-interval")) + slog_interval = atoi(optarg); break; default: cmdok = 0; @@ -372,17 +399,25 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (!server_data.www_dir) - server_data.www_dir = strdup(DEFAULT_WWW_DIR); + if (!server_data.www_dir) { + server_data.www_dir = realpath(DEFAULT_WWW_DIR, NULL); + if (!server_data.www_dir) { + fprintf(stderr, + _("Webserver directory does not exist.\n")); + exit(EXIT_FAILURE); + } + } if (!log_file) log_file = strdup(DEFAULT_LOG_FILE); + pmutex_init(&mutex); + log_open(log_file); - psensor_init(); + hddtemp_psensor_list_append(&server_data.sensors, 600); - server_data.sensors = get_all_sensors(0, 600); + lmsensor_psensor_list_append(&server_data.sensors, 600); #ifdef HAVE_GTOP server_data.cpu_usage = create_cpu_usage_sensor(600); @@ -404,23 +439,36 @@ int main(int argc, char *argv[]) log_info(_("WWW directory: %s"), server_data.www_dir); log_info(_("URL: http://localhost:%d"), port); - if (slog_file) - slog_init(slog_file, server_data.sensors); + if (slog_file) { + if (slog_interval <= 0) + slog_interval = 300; + ret = slog_activate(slog_file, + server_data.sensors, + &mutex, + slog_interval); + if (!ret) + log_err(_("Failed to activate logging of sensors.")); + } while (!server_stop_requested) { - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); #ifdef HAVE_GTOP sysinfo_update(&server_data.psysinfo); cpu_usage_sensor_update(server_data.cpu_usage); #endif - psensor_list_update_measures(server_data.sensors); - psensor_log_measures(server_data.sensors); +#ifdef HAVE_ATASMART + atasmart_psensor_list_update(server_data.sensors); +#endif + + hddtemp_psensor_list_update(server_data.sensors); - slog_write_sensors(server_data.sensors); + lmsensor_psensor_list_update(server_data.sensors); + + psensor_log_measures(server_data.sensors); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); sleep(5); } @@ -434,11 +482,10 @@ int main(int argc, char *argv[]) psensor_free(server_data.cpu_usage); #endif free(server_data.www_dir); - sensors_cleanup(); + lmsensor_cleanup(); #ifdef HAVE_GTOP sysinfo_cleanup(); - cpu_cleanup(); #endif if (log_file != DEFAULT_LOG_FILE)