X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=4757b79ed0b7096a5a8dae8c32a76b4b43cabed9;hp=e008f64166143e187ce5cd395ceba9e16267f758;hb=2152229c45f470a14dee33507b331ac38055e062;hpb=8e3fc8bfa55fe256ab9520db8df94dae57a1dc28 diff --git a/main.c b/main.c index e008f64..4757b79 100644 --- a/main.c +++ b/main.c @@ -10,6 +10,7 @@ #include "system.h" #include "interface.h" +unsigned int debug_mask = 0; const char *main_path = "."; static char **global_argv; @@ -18,22 +19,35 @@ 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) { fprintf(stderr, "Usage: %s [options]\n" "Options:\n" + " -d : Mask for debug messages\n" " -s : Path to the ubus socket\n" " -p : Path to netifd addons (default: %s)\n" + " -h : Path to the hotplug script\n" + " (default: "DEFAULT_HOTPLUG_PATH")\n" "\n", progname, main_path); return 1; @@ -46,14 +60,20 @@ int main(int argc, char **argv) global_argv = argv; - while ((ch = getopt(argc, argv, "s:")) != -1) { + while ((ch = getopt(argc, argv, "d:s:")) != -1) { switch(ch) { + case 'd': + debug_mask = strtoul(optarg, NULL, 0); + break; case 's': socket = optarg; break; case 'p': main_path = optarg; break; + case 'h': + hotplug_cmd_path = optarg; + break; default: return usage(argv[0]); }