service: fix SERVICE_ATTR_NAME usage in service_handle_set
[project/procd.git] / system.c
index 1e88b5d..151f613 100644 (file)
--- a/system.c
+++ b/system.c
  */
 
 #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 <libubox/uloop.h>
 
 #include "procd.h"
+#include "sysupgrade.h"
 #include "watchdog.h"
 
 static struct blob_buf b;
 static int notify;
 static struct ubus_context *_ctx;
 
-int upgrade_running = 0;
-
 static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                  struct ubus_request_data *req, const char *method,
                  struct blob_attr *msg)
@@ -78,7 +80,8 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                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))
                {
@@ -111,6 +114,40 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj,
                fclose(f);
        }
 
+       if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL)
+       {
+               if (fgets(line, sizeof(line), f))
+               {
+                       val = strtok(line, "\t\n");
+
+                       if (val)
+                               blobmsg_add_string(&b, "board_name", val);
+               }
+
+               fclose(f);
+       }
+       else if ((f = fopen("/proc/device-tree/compatible", "r")) != NULL)
+       {
+               if (fgets(line, sizeof(line), f))
+               {
+                       val = strtok(line, "\t\n");
+
+                       if (val)
+                       {
+                               next = val;
+                               while ((next = strchr(next, ',')) != NULL)
+                               {
+                                       *next = '-';
+                                       next++;
+                               }
+
+                               blobmsg_add_string(&b, "board_name", val);
+                       }
+               }
+
+               fclose(f);
+       }
+
        if ((f = fopen("/etc/openwrt_release", "r")) != NULL)
        {
                c = blobmsg_open_table(&b, "release");
@@ -143,6 +180,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 '\'':
@@ -180,23 +222,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]);
@@ -205,33 +251,35 @@ 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);
 
        return UBUS_STATUS_OK;
 }
 
-static int system_upgrade(struct ubus_context *ctx, struct ubus_object *obj,
-                       struct ubus_request_data *req, const char *method,
-                       struct blob_attr *msg)
+static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj,
+                        struct ubus_request_data *req, const char *method,
+                        struct blob_attr *msg)
 {
-       upgrade_running = 1;
+       procd_shutdown(RB_AUTOBOOT);
        return 0;
 }
 
 enum {
        WDT_FREQUENCY,
        WDT_TIMEOUT,
+       WDT_MAGICCLOSE,
        WDT_STOP,
        __WDT_MAX
 };
@@ -239,6 +287,7 @@ enum {
 static const struct blobmsg_policy watchdog_policy[__WDT_MAX] = {
        [WDT_FREQUENCY] = { .name = "frequency", .type = BLOBMSG_TYPE_INT32 },
        [WDT_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
+       [WDT_MAGICCLOSE] = { .name = "magicclose", .type = BLOBMSG_TYPE_BOOL },
        [WDT_STOP] = { .name = "stop", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -273,10 +322,13 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
                 watchdog_timeout(timeout);
        }
 
+       if (tb[WDT_MAGICCLOSE])
+               watchdog_set_magicclose(blobmsg_get_bool(tb[WDT_MAGICCLOSE]));
+
        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";
@@ -287,6 +339,7 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
        blobmsg_add_string(&b, "status", status);
        blobmsg_add_u32(&b, "timeout", watchdog_timeout(0));
        blobmsg_add_u32(&b, "frequency", watchdog_frequency(0));
+       blobmsg_add_u8(&b, "magicclose", watchdog_get_magicclose());
        ubus_send_reply(ctx, req, b.head);
 
        return 0;
@@ -322,46 +375,37 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 enum {
-       NAND_PATH,
-       __NAND_MAX
+       SYSUPGRADE_PATH,
+       SYSUPGRADE_PREFIX,
+       SYSUPGRADE_COMMAND,
+       __SYSUPGRADE_MAX
 };
 
-static const struct blobmsg_policy nand_policy[__NAND_MAX] = {
-       [NAND_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = {
+       [SYSUPGRADE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+       [SYSUPGRADE_PREFIX] = { .name = "prefix", .type = BLOBMSG_TYPE_STRING },
+       [SYSUPGRADE_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
 };
 
-static void
-procd_spawn_upgraded(char *path)
+static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
+                     struct ubus_request_data *req, const char *method,
+                     struct blob_attr *msg)
 {
-       char *wdt_fd = watchdog_fd();
-       char *argv[] = { "/tmp/upgraded", NULL, NULL};
-
-       argv[1] = path;
-
-       DEBUG(2, "Exec to upgraded now\n");
-       if (wdt_fd) {
-               watchdog_no_cloexec();
-               setenv("WDTFD", wdt_fd, 1);
-       }
-       execvp(argv[0], argv);
-}
-
-static int nand_set(struct ubus_context *ctx, struct ubus_object *obj,
-                       struct ubus_request_data *req, const char *method,
-                       struct blob_attr *msg)
-{
-       struct blob_attr *tb[__NAND_MAX];
+       struct blob_attr *tb[__SYSUPGRADE_MAX];
 
        if (!msg)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       blobmsg_parse(nand_policy, __NAND_MAX, tb, blob_data(msg), blob_len(msg));
-       if (!tb[NAND_PATH])
+       blobmsg_parse(sysupgrade_policy, __SYSUPGRADE_MAX, tb, blob_data(msg), blob_len(msg));
+       if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       procd_spawn_upgraded(blobmsg_get_string(tb[NAND_PATH]));
-       fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
-       return 0;
+       sysupgrade_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]),
+                                blobmsg_get_string(tb[SYSUPGRADE_PATH]),
+                                tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL);
+
+       /* sysupgrade_exec_upgraded() will never return unless something has gone wrong */
+       return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
 static void
@@ -374,12 +418,10 @@ procd_subscribe_cb(struct ubus_context *ctx, struct ubus_object *obj)
 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),
-
-       /* must remain at the end as it ia not always loaded */
-       UBUS_METHOD("nandupgrade", nand_set, nand_policy),
+       UBUS_METHOD("sysupgrade", sysupgrade, sysupgrade_policy),
 };
 
 static struct ubus_object_type system_object_type =
@@ -408,12 +450,8 @@ procd_bcast_event(char *event, struct blob_attr *msg)
 
 void ubus_init_system(struct ubus_context *ctx)
 {
-       struct stat s;
        int ret;
 
-       if (stat("/sbin/upgraded", &s))
-               system_object.n_methods -= 1;
-
        _ctx = ctx;
        ret = ubus_add_object(ctx, &system_object);
        if (ret)