when killed, kill pending child processes

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 02dd1e5..abc220e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -12,7 +12,63 @@
 
 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)
 {
@@ -47,12 +103,42 @@ static int usage(const char *progname)
                " -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;
 }
 
+static void
+netifd_handle_signal(int signo)
+{
+       uloop_end();
+}
+
+static void
+netifd_setup_signals(void)
+{
+       struct sigaction s;
+
+       memset(&s, 0, sizeof(s));
+       s.sa_handler = netifd_handle_signal;
+       s.sa_flags = 0;
+       sigaction(SIGINT, &s, NULL);
+       sigaction(SIGTERM, &s, NULL);
+       sigaction(SIGUSR1, &s, NULL);
+       sigaction(SIGUSR2, &s, NULL);
+}
+
+static void
+netifd_kill_processes(void)
+{
+       struct netifd_process *proc, *tmp;
+
+       list_for_each_entry_safe(proc, tmp, &process_list, list)
+               netifd_kill_process(proc);
+}
+
 int main(int argc, char **argv)
 {
        const char *socket = NULL;
@@ -60,7 +146,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);
@@ -74,11 +160,15 @@ int main(int argc, char **argv)
                case 'h':
                        hotplug_cmd_path = optarg;
                        break;
+               case 'r':
+                       resolv_conf = optarg;
+                       break;
                default:
                        return usage(argv[0]);
                }
        }
 
+       netifd_setup_signals();
        if (netifd_ubus_init(socket) < 0) {
                fprintf(stderr, "Failed to connect to ubus\n");
                return 1;
@@ -92,6 +182,7 @@ int main(int argc, char **argv)
        config_init_interfaces(NULL);
 
        uloop_run();
+       netifd_kill_processes();
 
        netifd_ubus_done();