debloat and reorganize code

[project/procd.git] / system.c

diff --git a/system.c b/system.c
index c96cb63..be02621 100644 (file)
--- a/system.c
+++ b/system.c
@@ -18,19 +18,18 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
+#include <signal.h>
 #include <unistd.h>
 
 #include <libubox/uloop.h>
 
 #include "procd.h"
 #include "watchdog.h"
-#include "hotplug.h"
-
-#define HOSTNAME_PATH  "/proc/sys/kernel/hostname"
 
 static struct blob_buf b;
 
+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)
@@ -189,10 +188,7 @@ static int system_upgrade(struct ubus_context *ctx, struct ubus_object *obj,
                        struct ubus_request_data *req, const char *method,
                        struct blob_attr *msg)
 {
-       procd_reconnect_ubus(0);
-       log_shutdown();
-       hotplug_shutdown();
-
+       upgrade_running = 1;
        return 0;
 }
 
@@ -259,11 +255,41 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+enum {
+       SIGNAL_PID,
+       SIGNAL_NUM,
+       __SIGNAL_MAX
+};
+
+static const struct blobmsg_policy signal_policy[__WDT_MAX] = {
+       [SIGNAL_PID] = { .name = "pid", .type = BLOBMSG_TYPE_INT32 },
+       [SIGNAL_NUM] = { .name = "signum", .type = BLOBMSG_TYPE_INT32 },
+};
+
+static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
+                       struct ubus_request_data *req, const char *method,
+                       struct blob_attr *msg)
+{
+       struct blob_attr *tb[__SIGNAL_MAX];
+
+       if (!msg)
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       blobmsg_parse(signal_policy, __SIGNAL_MAX, tb, blob_data(msg), blob_len(msg));
+       if (!tb[SIGNAL_PID || !tb[SIGNAL_NUM]])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       kill(blobmsg_get_u32(tb[SIGNAL_PID]), blobmsg_get_u32(tb[SIGNAL_NUM]));
+
+       return 0;
+}
+
 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),
 };
 
 static struct ubus_object_type system_object_type =