X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=7226979c2df96375ad1aa44a892488b39df68094;hp=2770844a1ecaed279755bd655bb30dc1c590fdc6;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=609664bb77874990e10f8073e54bb7f1645c8d72

diff --git a/src/server/server.h b/src/server/server.h
index 2770844..7226979 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -1,35 +1,44 @@
 /*
-    Copyright (C) 2010-2011 wpitchoune@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 published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2016 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #ifndef _PSENSOR_SERVER_H_
 #define _PSENSOR_SERVER_H_
 
+#include "config.h"
+
 #include "psensor.h"
+
+#ifdef HAVE_GTOP
 #include "sysinfo.h"
+#endif
 
-#define URL_BASE_API_1_0 "/api/1.0"
-#define URL_BASE_API_1_0_SENSORS "/api/1.0/sensors"
-#define URL_API_1_0_SERVER_STOP "/api/1.0/server/stop"
+#define URL_BASE_API_1_1 "/api/1.1"
+#define URL_BASE_API_1_1_SENSORS "/api/1.1/sensors"
+#define URL_API_1_1_SERVER_STOP "/api/1.1/server/stop"
+#define URL_API_1_1_SYSINFO "/api/1.1/sysinfo"
+#define URL_API_1_1_CPU_USAGE "/api/1.1/cpu/usage"
 
 struct server_data {
+	struct psensor *cpu_usage;
 	struct psensor **sensors;
+#ifdef HAVE_GTOP
 	struct psysinfo psysinfo;
+#endif
 	char *www_dir;
 };