X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=e008f64166143e187ce5cd395ceba9e16267f758;hp=4f6a4f613fbdeb76adfe09059639d14c580aae25;hb=9f43c03dd8632f14c190fcb5afcd465740f555d9;hpb=1f8dc227cdd425f1313f564fd074c614bb1954a3

diff --git a/main.c b/main.c
index 4f6a4f6..e008f64 100644
--- a/main.c
+++ b/main.c
@@ -2,13 +2,30 @@
 #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"
 
-int avl_strcmp(const void *k1, const void *k2, void *ptr)
+const char *main_path = ".";
+static char **global_argv;
+
+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,
+};
+
+void netifd_restart(void)
 {
-	return strcmp(k1, k2);
+	interface_set_down(NULL);
+	uloop_timeout_set(&restart_timer, 1000);
 }
 
 static int usage(const char *progname)
@@ -16,7 +33,8 @@ static int usage(const char *progname)
 	fprintf(stderr, "Usage: %s [options]\n"
 		"Options:\n"
 		" -s <path>:		Path to the ubus socket\n"
-		"\n", progname);
+		" -p <path>:		Path to netifd addons (default: %s)\n"
+		"\n", progname, main_path);
 
 	return 1;
 }
@@ -26,21 +44,31 @@ int main(int argc, char **argv)
 	const char *socket = NULL;
 	int ch;
 
+	global_argv = argv;
+
 	while ((ch = getopt(argc, argv, "s:")) != -1) {
 		switch(ch) {
 		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();