X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=bbae97b72238e1333b3c3ced59bcb9ac30b75bd4;hp=7630a8f76225c937ef8aaed1059f9dc2a70ad49c;hb=89ccd8055bb6c330bd9f883e37bbf36078d5d948;hpb=e4784c718099ce2e5c20410457e3c60d1eee8ed2

diff --git a/main.c b/main.c
index 7630a8f..bbae97b 100644
--- a/main.c
+++ b/main.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <syslog.h>
@@ -25,9 +24,12 @@
 #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;
+const char *config_path = DEFAULT_CONFIG_PATH;
 const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 
@@ -54,8 +56,6 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
-	if (proc->uloop.pending)
-		uloop_process_delete(&proc->uloop);
 	list_del(&proc->list);
 	ustream_free(&proc->log.stream);
 	close(proc->log.fd.fd);
@@ -85,7 +85,7 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
 	char *data;
 	int len = 0;
 
-	proc = container_of(s, struct netifd_process, log);
+	proc = container_of(s, struct netifd_process, log.stream);
 	log_prefix = proc->log_prefix;
 	if (!log_prefix)
 		log_prefix = "process";
@@ -113,7 +113,9 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
 			netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
 				log_prefix, proc->uloop.pid, data);
 			proc->log_overflow = true;
-		}
+		} else
+			break;
+
 		ustream_consume(s, len);
 	} while (1);
 }
@@ -144,6 +146,8 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 		goto error;
 
 	if (!pid) {
+		int i;
+
 		if (env) {
 			while (*env) {
 				putenv(*env);
@@ -151,14 +155,19 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 			}
 		}
 		if (proc->dir_fd >= 0)
-			fchdir(proc->dir_fd);
-
-		dup2(pfds[1], 0);
-		dup2(pfds[1], 1);
-		dup2(pfds[1], 2);
+			if (fchdir(proc->dir_fd)) {}
 
 		close(pfds[0]);
-		close(pfds[1]);
+
+		for (i = 0; i <= 2; i++) {
+			if (pfds[1] == i)
+				continue;
+
+			dup2(pfds[1], i);
+		}
+
+		if (pfds[1] > 2)
+			close(pfds[1]);
 
 		execvp(argv[0], (char **) argv);
 		exit(127);
@@ -193,6 +202,7 @@ netifd_kill_process(struct netifd_process *proc)
 		return;
 
 	kill(proc->uloop.pid, SIGKILL);
+	uloop_process_delete(&proc->uloop);
 	netifd_delete_process(proc);
 }
 
@@ -201,22 +211,17 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 	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)
 {
-	main_timer.cb = netifd_do_reload;
-	uloop_timeout_set(&main_timer, 100);
+	config_init_all();
 }
 
 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);
 }
@@ -228,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"
+		" -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"
@@ -277,7 +283,7 @@ int main(int argc, char **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);
@@ -288,6 +294,9 @@ int main(int argc, char **argv)
 		case 'p':
 			main_path = optarg;
 			break;
+		case 'c':
+			config_path = optarg;
+			break;
 		case 'h':
 			hotplug_cmd_path = optarg;
 			break;
@@ -318,6 +327,9 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	proto_shell_init();
+	wireless_init();
+
 	if (system_init()) {
 		fprintf(stderr, "Failed to initialize system control\n");
 		return 1;