json 0.12 fixes

[project/procd.git] / system.c

diff --git a/system.c b/system.c
index 4b3b82c55b0b71fd4b71e3b0fb90c96fe2f47f05..77111f90cacac7f8d3b0e9a7bb147b7e0117493d 100644 (file)
--- a/system.c
+++ b/system.c
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #include <libubox/uloop.h>
 
@@ -64,15 +65,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))
                {
@@ -199,15 +206,15 @@ 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);
 
        ubus_send_reply(ctx, req, b.head);