X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=02dd1e51c308db7728b8bd7499044ccd5710d14d;hp=da5ae092ad52a608046bc5eed53695fac5b7797f;hb=7c4108d49d3048d8c14e73d5f366a13ed814df8d;hpb=cfc905f003aefe4735f8645c561f789ffd0b1f30

diff --git a/main.c b/main.c
index da5ae09..02dd1e5 100644
--- a/main.c
+++ b/main.c
@@ -2,12 +2,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
+#include <unistd.h>
 
 #include "netifd.h"
 #include "ubus.h"
 #include "config.h"
+#include "system.h"
+#include "interface.h"
 
-const char *main_path = ".";
+unsigned int debug_mask = 0;
+const char *main_path = DEFAULT_MAIN_PATH;
 static char **global_argv;
 
 static void netifd_do_restart(struct uloop_timeout *timeout)
@@ -15,21 +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)
 {
-	uloop_timeout_set(&restart_timer, 1000);
+	main_timer.cb = netifd_do_restart;
+	interface_set_down(NULL);
+	uloop_timeout_set(&main_timer, 1000);
 }
 
 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"
+		" -h <path>:		Path to the hotplug script\n"
+		"			(default: "DEFAULT_HOTPLUG_PATH")\n"
 		"\n", progname, main_path);
 
 	return 1;
@@ -42,24 +60,35 @@ 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]);
 		}
 	}
 
-	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();