X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=d868d86163fcdc3a724921ddc97b42b2baad5d00;hp=55649b8949382a8d3f2602e2f7450204f412cce8;hb=d9faf40c40a26a23d26eac96ef7c28efec46e133;hpb=434e47440fdd1167c49ed402fc1f5234124810de

diff --git a/src/server/server.c b/src/server/server.c
index 55649b8..d868d86 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -23,6 +23,7 @@
 #include <libintl.h>
 #define _(str) gettext(str)
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,11 +40,14 @@
 
 #ifdef HAVE_GTOP
 #include "sysinfo.h"
-#include "cpu.h"
+#include <pgtop2.h>
 #endif
 
+#include <hdd.h>
+#include <lmsensor.h>
 #include <plog.h>
 #include "psensor_json.h"
+#include <pmutex.h>
 #include "url.h"
 #include "server.h"
 #include "slog.h"
@@ -74,7 +78,7 @@ static struct option long_options[] = {
 
 static struct server_data server_data;
 
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mutex;
 
 static int server_stop_requested;
 
@@ -189,8 +193,9 @@ create_response_api(const char *nurl, const char *method, unsigned int *rp_code)
 	if (page) {
 		*rp_code = MHD_HTTP_OK;
 
-		resp = MHD_create_response_from_data(strlen(page), page,
-						     MHD_YES, MHD_NO);
+		resp = MHD_create_response_from_buffer(strlen(page),
+						       page,
+						       MHD_RESPMEM_MUST_FREE);
 
 		MHD_add_response_header(resp, MHD_HTTP_HEADER_CONTENT_TYPE,
 					"application/json");
@@ -220,8 +225,8 @@ static struct MHD_Response *create_response_file(const char *nurl,
 
 			if (!st.st_size) {
 				fclose(file);
-				return MHD_create_response_from_data
-					(0, NULL, MHD_NO, MHD_NO);
+				return MHD_create_response_from_buffer
+					(0, NULL, 0);
 			}
 
 			return MHD_create_response_from_callback
@@ -242,27 +247,38 @@ 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_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_buffer(strlen(page),
+					       page,
+					       MHD_RESPMEM_MUST_FREE);
 }
 
 static int cbk_http_request(void *cls,
@@ -298,9 +314,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);
@@ -343,7 +359,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)
@@ -382,17 +398,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);
@@ -426,17 +450,24 @@ int main(int argc, char *argv[])
 	}
 
 	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);
+
+#ifdef HAVE_ATASMART
+		atasmart_psensor_list_update(server_data.sensors);
+#endif
+
+		hddtemp_psensor_list_update(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);
 	}
 
@@ -454,7 +485,6 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_GTOP
 	sysinfo_cleanup();
-	cpu_cleanup();
 #endif
 
 	if (log_file != DEFAULT_LOG_FILE)