add a ubus call for triggering config reloads

diff --git a/main.c b/main.c
index e008f64166143e187ce5cd395ceba9e16267f758..fe97ee1385a54ac1e65427ffbadd0ef15e7a1ffb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,14 +18,24 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
-static struct uloop_timeout restart_timer = {
-       .cb = netifd_do_restart,
-};
+static void netifd_do_reload(struct uloop_timeout *timeout)
+{
+       config_init_interfaces(NULL);
+}
+
+static struct uloop_timeout main_timer;
+
+void netifd_reload(void)
+{
+       main_timer.cb = netifd_do_reload;
+       uloop_timeout_set(&main_timer, 100);
+}
 
 void netifd_restart(void)
 {
+       main_timer.cb = netifd_do_restart;
        interface_set_down(NULL);
-       uloop_timeout_set(&restart_timer, 1000);
+       uloop_timeout_set(&main_timer, 1000);
 }
 
 static int usage(const char *progname)

diff --git a/netifd.h b/netifd.h
index be29b3cc8c213e5cb984b4c63197f81c9910b89a..fc2b6a7540336da788d4b0394500a905460bd69e 100644 (file)
--- a/netifd.h
+++ b/netifd.h
@@ -18,5 +18,6 @@ struct interface;
 
 extern const char *main_path;
 void netifd_restart(void);
+void netifd_reload(void);
 
 #endif

diff --git a/ubus.c b/ubus.c
index 5d9d921e899b607c296e254bc7e2319a215dfd28..d5a7007a08dd47172a517dee68c9ba705fc1ee57 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -57,10 +57,20 @@ netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+static int
+netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
+                     struct ubus_request_data *req, const char *method,
+                     struct blob_attr *msg)
+{
+       netifd_reload();
+       return 0;
+}
+
 static struct ubus_method main_object_methods[] = {
        UBUS_METHOD("add_device", netifd_handle_device, dev_policy),
        UBUS_METHOD("remove_device", netifd_handle_device, dev_policy),
        { .name = "restart", .handler = netifd_handle_restart },
+       { .name = "reload", .handler = netifd_handle_reload },
 };
 
 static struct ubus_object_type main_object_type =