system-linux: fix deletion of ip tunnels (FS#4058)

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index bbae97b72238e1333b3c3ced59bcb9ac30b75bd4..0fb72b344f2317f6cb9745f433952ce2c69b7f3f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -26,6 +26,7 @@
 #include "interface.h"
 #include "wireless.h"
 #include "proto.h"
+#include "extdev.h"
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
@@ -56,6 +57,7 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
+       while (ustream_poll(&proc->log.stream));
        list_del(&proc->list);
        ustream_free(&proc->log.stream);
        close(proc->log.fd.fd);
@@ -126,7 +128,6 @@ netifd_process_cb(struct uloop_process *proc, int ret)
        struct netifd_process *np;
        np = container_of(proc, struct netifd_process, uloop);
 
-       while (ustream_poll(&np->log.stream));
        netifd_delete_process(np);
        return np->cb(np, ret);
 }
@@ -173,9 +174,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                exit(127);
        }
 
-       if (pid < 0)
-               goto error;
-
        close(pfds[1]);
        proc->uloop.cb = netifd_process_cb;
        proc->uloop.pid = pid;
@@ -211,9 +209,9 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
-void netifd_reload(void)
+int netifd_reload(void)
 {
-       config_init_all();
+       return config_init_all();
 }
 
 void netifd_restart(void)
@@ -328,6 +326,7 @@ int main(int argc, char **argv)
        }
 
        proto_shell_init();
+       extdev_init();
        wireless_init();
 
        if (system_init()) {