summaryrefslogtreecommitdiffhomepage
path: root/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-10-15 17:00:24 +0200
committerFelix Fietkau <nbd@openwrt.org>2011-10-15 17:14:45 +0200
commit745016bc4a0c143296861d6a322042f217467e28 (patch)
treed9f393c69c9b8f29cd7d02a239e59159ab240124 /main.c
parent3216a341221f9b0b2901f6489c77888c1a9e192c (diff)
keep track of all running child processes in one place
Diffstat (limited to 'main.c')
-rw-r--r--main.c55
1 files changed, 55 insertions, 0 deletions
diff --git a/main.c b/main.c
index 5770782..352519d 100644
--- a/main.c
+++ b/main.c
@@ -14,6 +14,61 @@ unsigned int debug_mask = 0;
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)
{