add support for calls to a hotplug script on interface state changes

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 7602f23..4757b79 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,8 +7,10 @@
 #include "netifd.h"
 #include "ubus.h"
 #include "config.h"
 #include "netifd.h"
 #include "ubus.h"
 #include "config.h"

+#include "system.h"

 #include "interface.h"
 
 #include "interface.h"
 

+unsigned int debug_mask = 0;

 const char *main_path = ".";
 static char **global_argv;
 
 const char *main_path = ".";
 static char **global_argv;
 


@@ -17,22 +19,35 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
        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)
 {
 
 void netifd_restart(void)
 {

+       main_timer.cb = netifd_do_restart;

        interface_set_down(NULL);
        interface_set_down(NULL);

-       uloop_timeout_set(&restart_timer, 1000);
+       uloop_timeout_set(&main_timer, 1000);

 }
 
 static int usage(const char *progname)
 {
        fprintf(stderr, "Usage: %s [options]\n"
                "Options:\n"
 }
 
 static int usage(const char *progname)
 {
        fprintf(stderr, "Usage: %s [options]\n"
                "Options:\n"

+               " -d <mask>:            Mask for debug messages\n"

                " -s <path>:            Path to the ubus socket\n"
                " -p <path>:            Path to netifd addons (default: %s)\n"
                " -s <path>:            Path to the ubus socket\n"
                " -p <path>:            Path to netifd addons (default: %s)\n"

+               " -h <path>:            Path to the hotplug script\n"
+               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"

                "\n", progname, main_path);
 
        return 1;
                "\n", progname, main_path);
 
        return 1;


@@ -45,14 +60,20 @@ int main(int argc, char **argv)
 
        global_argv = argv;
 
 
        global_argv = argv;
 

-       while ((ch = getopt(argc, argv, "s:")) != -1) {
+       while ((ch = getopt(argc, argv, "d:s:")) != -1) {

                switch(ch) {
                switch(ch) {

+               case 'd':
+                       debug_mask = strtoul(optarg, NULL, 0);
+                       break;

                case 's':
                        socket = optarg;
                        break;
                case 'p':
                        main_path = optarg;
                        break;
                case 's':
                        socket = optarg;
                        break;
                case 'p':
                        main_path = optarg;
                        break;

+               case 'h':
+                       hotplug_cmd_path = optarg;
+                       break;

                default:
                        return usage(argv[0]);
                }
                default:
                        return usage(argv[0]);
                }


@@ -63,6 +84,11 @@ int main(int argc, char **argv)
                return 1;
        }
 
                return 1;
        }
 

+       if (system_init()) {
+               fprintf(stderr, "Failed to initialize system control\n");
+               return 1;
+       }
+

        config_init_interfaces(NULL);
 
        uloop_run();
        config_init_interfaces(NULL);
 
        uloop_run();