system: always support staged sysupgrade

[project/procd.git] / system.c

diff --git a/system.c b/system.c
index 77111f9..bb2abe5 100644 (file)
--- a/system.c
+++ b/system.c
@@ -13,9 +13,12 @@
  */
 
 #include <sys/utsname.h>
  */
 
 #include <sys/utsname.h>

+#ifdef linux

 #include <sys/sysinfo.h>
 #include <sys/sysinfo.h>

+#endif

 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>

+#include <sys/reboot.h>

 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>


@@ -144,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));
                                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 '\'':
                        while (val && (ch = *(val++)) != 0) {
                                switch (ch) {
                                case '\'':


@@ -181,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)
 {
                 struct ubus_request_data *req, const char *method,
                 struct blob_attr *msg)
 {

-       void *c;

        time_t now;
        struct tm *tm;
        time_t now;
        struct tm *tm;

+#ifdef linux

        struct sysinfo info;
        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;
 
 
        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);
 
        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, "uptime",    info.uptime);

-       blobmsg_add_u32(&b, "localtime", mktime(tm));

 
        c = blobmsg_open_array(&b, "load");
        blobmsg_add_u32(&b, NULL, info.loads[0]);
 
        c = blobmsg_open_array(&b, "load");
        blobmsg_add_u32(&b, NULL, info.loads[0]);


@@ -216,6 +228,7 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj,
        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);
        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);
 
 
        ubus_send_reply(ctx, req, b.head);
 


@@ -230,6 +243,14 @@ static int system_upgrade(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
        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,
 enum {
        WDT_FREQUENCY,
        WDT_TIMEOUT,


@@ -277,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 (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";
                status = "offline";
        else if (watchdog_get_stopped())
                status = "stopped";


@@ -323,12 +344,12 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 enum {
 }
 
 enum {

-       NAND_PATH,
-       __NAND_MAX
+       SYSUPGRADE_PATH,
+       __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 },

 };
 
 static void
 };
 
 static void


@@ -347,20 +368,20 @@ procd_spawn_upgraded(char *path)
        execvp(argv[0], argv);
 }
 
        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)
+static int sysupgrade(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;
 
 
        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])

                return UBUS_STATUS_INVALID_ARGUMENT;
 
                return UBUS_STATUS_INVALID_ARGUMENT;
 

-       procd_spawn_upgraded(blobmsg_get_string(tb[NAND_PATH]));
+       procd_spawn_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PATH]));

        fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
        return 0;
 }
        fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
        return 0;
 }


@@ -376,11 +397,11 @@ 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("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),
        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("nandupgrade", sysupgrade, sysupgrade_policy),
+       UBUS_METHOD("sysupgrade", sysupgrade, sysupgrade_policy),

 };
 
 static struct ubus_object_type system_object_type =
 };
 
 static struct ubus_object_type system_object_type =


@@ -409,12 +430,8 @@ procd_bcast_event(char *event, struct blob_attr *msg)
 
 void ubus_init_system(struct ubus_context *ctx)
 {
 
 void ubus_init_system(struct ubus_context *ctx)
 {

-       struct stat s;

        int ret;
 
        int ret;
 

-       if (stat("/sbin/upgraded", &s))
-               system_object.n_methods -= 1;
-

        _ctx = ctx;
        ret = ubus_add_object(ctx, &system_object);
        if (ret)
        _ctx = ctx;
        ret = ubus_add_object(ctx, &system_object);
        if (ret)