interface: apply device config passed through interface config

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 43ec24f..bbae97b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,9 +24,12 @@
 #include "config.h"
 #include "system.h"
 #include "interface.h"
 #include "config.h"
 #include "system.h"
 #include "interface.h"

+#include "wireless.h"
+#include "proto.h"

 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;

+const char *config_path = DEFAULT_CONFIG_PATH;

 const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 
 const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 


@@ -208,22 +211,17 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
        execvp(global_argv[0], global_argv);
 }
 

-static void netifd_do_reload(struct uloop_timeout *timeout)
-{
-       config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-

 void netifd_reload(void)
 {
 void netifd_reload(void)
 {

-       main_timer.cb = netifd_do_reload;
-       uloop_timeout_set(&main_timer, 100);
+       config_init_all();

 }
 
 void netifd_restart(void)
 {
 }
 
 void netifd_restart(void)
 {

-       main_timer.cb = netifd_do_restart;
+       static struct uloop_timeout main_timer = {
+               .cb = netifd_do_restart
+       };
+

        interface_set_down(NULL);
        uloop_timeout_set(&main_timer, 1000);
 }
        interface_set_down(NULL);
        uloop_timeout_set(&main_timer, 1000);
 }


@@ -235,6 +233,7 @@ static int usage(const char *progname)
                " -d <mask>:            Mask for debug messages\n"
                " -s <path>:            Path to the ubus socket\n"
                " -p <path>:            Path to netifd addons (default: %s)\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"

+               " -c <path>:            Path to UCI configuration\n"

                " -h <path>:            Path to the hotplug script\n"
                " -r <path>:            Path to resolv.conf\n"
                " -l <level>:           Log output level (default: %d)\n"
                " -h <path>:            Path to the hotplug script\n"
                " -r <path>:            Path to resolv.conf\n"
                " -l <level>:           Log output level (default: %d)\n"


@@ -284,7 +283,7 @@ int main(int argc, char **argv)
 
        global_argv = argv;
 
 
        global_argv = argv;
 

-       while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) {
+       while ((ch = getopt(argc, argv, "d:s:p:c:h:r:l:S")) != -1) {

                switch(ch) {
                case 'd':
                        debug_mask = strtoul(optarg, NULL, 0);
                switch(ch) {
                case 'd':
                        debug_mask = strtoul(optarg, NULL, 0);


@@ -295,6 +294,9 @@ int main(int argc, char **argv)
                case 'p':
                        main_path = optarg;
                        break;
                case 'p':
                        main_path = optarg;
                        break;

+               case 'c':
+                       config_path = optarg;
+                       break;

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


@@ -325,6 +327,9 @@ int main(int argc, char **argv)
                return 1;
        }
 
                return 1;
        }
 

+       proto_shell_init();
+       wireless_init();
+

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