IPv6: fix prefix assignment with continuous hints

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 7630a8f..c1f55e9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -54,8 +54,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 +83,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 +111,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);
 }
@@ -193,6 +193,7 @@ netifd_kill_process(struct netifd_process *proc)
                return;
 
        kill(proc->uloop.pid, SIGKILL);
+       uloop_process_delete(&proc->uloop);
        netifd_delete_process(proc);
 }