fix container_of for the log ustream

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 5bfd87a..56851e0 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";
@@ -118,10 +116,6 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
        } while (1);
 }
 
-static void netifd_process_log_state_cb(struct ustream *s)
-{
-}
-
 static void
 netifd_process_cb(struct uloop_process *proc, int ret)
 {
@@ -180,7 +174,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
        system_fd_set_cloexec(pfds[0]);
        proc->log.stream.string_data = true;
        proc->log.stream.notify_read = netifd_process_log_read_cb;
-       proc->log.stream.notify_state = netifd_process_log_state_cb;
        ustream_fd_init(&proc->log, pfds[0]);
 
        return 0;
@@ -198,6 +191,7 @@ netifd_kill_process(struct netifd_process *proc)
                return;
 
        kill(proc->uloop.pid, SIGKILL);
+       uloop_process_delete(&proc->uloop);
        netifd_delete_process(proc);
 }