X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=352519de5d32cc4b2baa4029c983442b3975a3f2;hp=465398f219ac606effdfe3afb5a8cb4cb4d13b9d;hb=745016bc4a0c143296861d6a322042f217467e28;hpb=64c271ed3bd50ce5ffbf69108d75bb79d279e8d9;ds=sidebyside

diff --git a/main.c b/main.c
index 465398f..352519d 100644
--- a/main.c
+++ b/main.c
@@ -11,8 +11,64 @@
 #include "interface.h"
 
 unsigned int debug_mask = 0;
-const char *main_path = ".";
+const char *main_path = DEFAULT_MAIN_PATH;
+const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
+static struct list_head process_list = LIST_HEAD_INIT(process_list);
+
+static void
+netifd_process_cb(struct uloop_process *proc, int ret)
+{
+	struct netifd_process *np;
+	np = container_of(proc, struct netifd_process, uloop);
+	list_del(&np->list);
+	return np->cb(np, ret);
+}
+
+int
+netifd_start_process(const char **argv, char **env, int dir_fd, struct netifd_process *proc)
+{
+	int pid;
+
+	netifd_kill_process(proc);
+
+	if ((pid = fork()) < 0)
+		return -1;
+
+	if (!pid) {
+		if (env) {
+			while (*env) {
+				putenv(*env);
+				env++;
+			}
+		}
+		if (dir_fd >= 0)
+			fchdir(dir_fd);
+		execvp(argv[0], (char **) argv);
+		exit(127);
+	}
+
+	if (pid < 0)
+		return -1;
+
+	proc->uloop.cb = netifd_process_cb;
+	proc->uloop.pid = pid;
+	uloop_process_add(&proc->uloop);
+	list_add_tail(&proc->list, &process_list);
+
+	return 0;
+}
+
+void
+netifd_kill_process(struct netifd_process *proc)
+{
+	if (!proc->uloop.pending)
+		return;
+
+	kill(proc->uloop.pid, SIGTERM);
+	uloop_process_delete(&proc->uloop);
+	list_del(&proc->list);
+}
 
 static void netifd_do_restart(struct uloop_timeout *timeout)
 {
@@ -46,6 +102,9 @@ 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"
+		" -h <path>:		Path to the hotplug script\n"
+		" -r <path>:		Path to resolv.conf\n"
+		"			(default: "DEFAULT_HOTPLUG_PATH")\n"
 		"\n", progname, main_path);
 
 	return 1;
@@ -58,7 +117,7 @@ int main(int argc, char **argv)
 
 	global_argv = argv;
 
-	while ((ch = getopt(argc, argv, "d:s:")) != -1) {
+	while ((ch = getopt(argc, argv, "d:s:p:h:r:")) != -1) {
 		switch(ch) {
 		case 'd':
 			debug_mask = strtoul(optarg, NULL, 0);
@@ -69,6 +128,12 @@ int main(int argc, char **argv)
 		case 'p':
 			main_path = optarg;
 			break;
+		case 'h':
+			hotplug_cmd_path = optarg;
+			break;
+		case 'r':
+			resolv_conf = optarg;
+			break;
 		default:
 			return usage(argv[0]);
 		}