X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=e008f64166143e187ce5cd395ceba9e16267f758;hp=d1f976d3e011cb18b38cde76398d00e87182f3fe;hb=14fae227e03e69df2bf8af4c1490929459727ca8;hpb=275a09d6c5ca1c1b03cfc74a5f856c7304adc80c diff --git a/main.c b/main.c index d1f976d..e008f64 100644 --- a/main.c +++ b/main.c @@ -2,11 +2,15 @@ #include #include #include +#include #include "netifd.h" #include "ubus.h" #include "config.h" +#include "system.h" +#include "interface.h" +const char *main_path = "."; static char **global_argv; static void netifd_do_restart(struct uloop_timeout *timeout) @@ -20,6 +24,7 @@ static struct uloop_timeout restart_timer = { void netifd_restart(void) { + interface_set_down(NULL); uloop_timeout_set(&restart_timer, 1000); } @@ -28,7 +33,8 @@ static int usage(const char *progname) fprintf(stderr, "Usage: %s [options]\n" "Options:\n" " -s : Path to the ubus socket\n" - "\n", progname); + " -p : Path to netifd addons (default: %s)\n" + "\n", progname, main_path); return 1; } @@ -45,16 +51,24 @@ int main(int argc, char **argv) case 's': socket = optarg; break; + case 'p': + main_path = optarg; + break; default: return usage(argv[0]); } } - if (netifd_ubus_init(NULL) < 0) { + if (netifd_ubus_init(socket) < 0) { fprintf(stderr, "Failed to connect to ubus\n"); return 1; } + if (system_init()) { + fprintf(stderr, "Failed to initialize system control\n"); + return 1; + } + config_init_interfaces(NULL); uloop_run();