X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system.c;h=1e31ce6859cd760fb07e43266ab62a1f07db09e8;hb=98dc89149231c5268de38fc98590f9267aa9d05b;hp=4b3b82c55b0b71fd4b71e3b0fb90c96fe2f47f05;hpb=35e01a9601292b2f609e65c2ddb3990cba8f378e;p=project%2Fprocd.git

diff --git a/system.c b/system.c
index 4b3b82c..1e31ce6 100644
--- a/system.c
+++ b/system.c
@@ -13,13 +13,17 @@
  */
 
 #include <sys/utsname.h>
+#ifdef linux
 #include <sys/sysinfo.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/reboot.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #include <libubox/uloop.h>
 
@@ -64,15 +68,21 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
 			    !strcasecmp(key, "processor") ||
 			    !strcasecmp(key, "model name"))
 			{
-				blobmsg_add_string(&b, "system", val + 2);
-				break;
+				strtoul(val + 2, &key, 0);
+
+				if (key == (val + 2) || *key != 0)
+				{
+					blobmsg_add_string(&b, "system", val + 2);
+					break;
+				}
 			}
 		}
 
 		fclose(f);
 	}
 
-	if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL)
+	if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL ||
+	    (f = fopen("/proc/device-tree/model", "r")) != NULL)
 	{
 		if (fgets(line, sizeof(line), f))
 		{
@@ -137,6 +147,11 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
 				continue;
 
 			dest = blobmsg_alloc_string_buffer(&b, key, strlen(val));
+			if (!dest) {
+				ERROR("Failed to allocate blob.\n");
+				continue;
+			}
+
 			while (val && (ch = *(val++)) != 0) {
 				switch (ch) {
 				case '\'':
@@ -174,23 +189,27 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj,
                 struct ubus_request_data *req, const char *method,
                 struct blob_attr *msg)
 {
-	void *c;
 	time_t now;
 	struct tm *tm;
+#ifdef linux
 	struct sysinfo info;
+	void *c;
+
+	if (sysinfo(&info))
+		return UBUS_STATUS_UNKNOWN_ERROR;
+#endif
 
 	now = time(NULL);
 
 	if (!(tm = localtime(&now)))
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	if (sysinfo(&info))
-		return UBUS_STATUS_UNKNOWN_ERROR;
-
 	blob_buf_init(&b, 0);
 
+	blobmsg_add_u32(&b, "localtime", now + tm->tm_gmtoff);
+
+#ifdef linux
 	blobmsg_add_u32(&b, "uptime",    info.uptime);
-	blobmsg_add_u32(&b, "localtime", mktime(tm));
 
 	c = blobmsg_open_array(&b, "load");
 	blobmsg_add_u32(&b, NULL, info.loads[0]);
@@ -199,16 +218,17 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj,
 	blobmsg_close_array(&b, c);
 
 	c = blobmsg_open_table(&b, "memory");
-	blobmsg_add_u32(&b, "total",    info.mem_unit * info.totalram);
-	blobmsg_add_u32(&b, "free",     info.mem_unit * info.freeram);
-	blobmsg_add_u32(&b, "shared",   info.mem_unit * info.sharedram);
-	blobmsg_add_u32(&b, "buffered", info.mem_unit * info.bufferram);
+	blobmsg_add_u64(&b, "total",    info.mem_unit * info.totalram);
+	blobmsg_add_u64(&b, "free",     info.mem_unit * info.freeram);
+	blobmsg_add_u64(&b, "shared",   info.mem_unit * info.sharedram);
+	blobmsg_add_u64(&b, "buffered", info.mem_unit * info.bufferram);
 	blobmsg_close_table(&b, c);
 
 	c = blobmsg_open_table(&b, "swap");
-	blobmsg_add_u32(&b, "total",    info.mem_unit * info.totalswap);
-	blobmsg_add_u32(&b, "free",     info.mem_unit * info.freeswap);
+	blobmsg_add_u64(&b, "total",    info.mem_unit * info.totalswap);
+	blobmsg_add_u64(&b, "free",     info.mem_unit * info.freeswap);
 	blobmsg_close_table(&b, c);
+#endif
 
 	ubus_send_reply(ctx, req, b.head);
 
@@ -223,6 +243,14 @@ static int system_upgrade(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj,
+			 struct ubus_request_data *req, const char *method,
+			 struct blob_attr *msg)
+{
+	procd_shutdown(RB_AUTOBOOT);
+	return 0;
+}
+
 enum {
 	WDT_FREQUENCY,
 	WDT_TIMEOUT,
@@ -270,7 +298,7 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
 	if (tb[WDT_STOP])
 		watchdog_set_stopped(blobmsg_get_bool(tb[WDT_STOP]));
 
-	if (watchdog_fd() < 0)
+	if (watchdog_fd() == NULL)
 		status = "offline";
 	else if (watchdog_get_stopped())
 		status = "stopped";
@@ -369,6 +397,7 @@ static const struct ubus_method system_methods[] = {
 	UBUS_METHOD_NOARG("board", system_board),
 	UBUS_METHOD_NOARG("info",  system_info),
 	UBUS_METHOD_NOARG("upgrade", system_upgrade),
+	UBUS_METHOD_NOARG("reboot", system_reboot),
 	UBUS_METHOD("watchdog", watchdog_set, watchdog_policy),
 	UBUS_METHOD("signal", proc_signal, signal_policy),