#include <fcntl.h>
#include <signal.h>
#include <unistd.h>
+#include <stdlib.h>
#include <libubox/uloop.h>
#include "watchdog.h"
static struct blob_buf b;
+static int notify;
+static struct ubus_context *_ctx;
int upgrade_running = 0;
{
void *c;
char line[256];
- char *key, *val;
+ char *key, *val, *next;
struct utsname utsname;
FILE *f;
!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))
{
while (fgets(line, sizeof(line), f))
{
- key = strtok(line, "=\"");
- val = strtok(NULL, "\"\n");
+ char *dest;
+ char ch;
- if (!key || !val)
+ key = line;
+ val = strchr(line, '=');
+ if (!val)
continue;
+ *(val++) = 0;
+
if (!strcasecmp(key, "DISTRIB_ID"))
- blobmsg_add_string(&b, "distribution", val);
+ key = "distribution";
else if (!strcasecmp(key, "DISTRIB_RELEASE"))
- blobmsg_add_string(&b, "version", val);
+ key = "version";
else if (!strcasecmp(key, "DISTRIB_REVISION"))
- blobmsg_add_string(&b, "revision", val);
+ key = "revision";
else if (!strcasecmp(key, "DISTRIB_CODENAME"))
- blobmsg_add_string(&b, "codename", val);
+ key = "codename";
else if (!strcasecmp(key, "DISTRIB_TARGET"))
- blobmsg_add_string(&b, "target", val);
+ key = "target";
else if (!strcasecmp(key, "DISTRIB_DESCRIPTION"))
- blobmsg_add_string(&b, "description", val);
+ key = "description";
+ else
+ continue;
+
+ dest = blobmsg_alloc_string_buffer(&b, key, strlen(val));
+ while (val && (ch = *(val++)) != 0) {
+ switch (ch) {
+ case '\'':
+ case '"':
+ next = strchr(val, ch);
+ if (next)
+ *next = 0;
+
+ strcpy(dest, val);
+
+ if (next)
+ val = next + 1;
+
+ dest += strlen(dest);
+ break;
+ case '\\':
+ *(dest++) = *(val++);
+ break;
+ }
+ }
+ blobmsg_add_string_buffer(&b);
}
blobmsg_close_array(&b, c);
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);
__SIGNAL_MAX
};
-static const struct blobmsg_policy signal_policy[__WDT_MAX] = {
+static const struct blobmsg_policy signal_policy[__SIGNAL_MAX] = {
[SIGNAL_PID] = { .name = "pid", .type = BLOBMSG_TYPE_INT32 },
[SIGNAL_NUM] = { .name = "signum", .type = BLOBMSG_TYPE_INT32 },
};
return 0;
}
+enum {
+ NAND_PATH,
+ __NAND_MAX
+};
+
+static const struct blobmsg_policy nand_policy[__NAND_MAX] = {
+ [NAND_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+};
+
+static void
+procd_spawn_upgraded(char *path)
+{
+ 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];
+
+ if (!msg)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ blobmsg_parse(nand_policy, __NAND_MAX, tb, blob_data(msg), blob_len(msg));
+ if (!tb[NAND_PATH])
+ 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;
+}
+
+static void
+procd_subscribe_cb(struct ubus_context *ctx, struct ubus_object *obj)
+{
+ notify = obj->has_subscribers;
+}
+
+
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("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),
};
static struct ubus_object_type system_object_type =
.type = &system_object_type,
.methods = system_methods,
.n_methods = ARRAY_SIZE(system_methods),
+ .subscribe_cb = procd_subscribe_cb,
};
+void
+procd_bcast_event(char *event, struct blob_attr *msg)
+{
+ int ret;
+
+ if (!notify)
+ return;
+
+ ret = ubus_notify(_ctx, &system_object, event, msg, -1);
+ if (ret)
+ fprintf(stderr, "Failed to notify log: %s\n", ubus_strerror(ret));
+}
+
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)
ERROR("Failed to add object: %s\n", ubus_strerror(ret));
projects / project / procd.git / blobdiff