use FD_CLOEXEC instead of tracking lists of fds

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 3f16cd5..2fef776 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,7 +32,6 @@ const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 
 static struct list_head process_list = LIST_HEAD_INIT(process_list);
-static struct list_head fds = LIST_HEAD_INIT(fds);
 
 #define DEFAULT_LOG_LEVEL L_NOTICE
 
@@ -45,7 +57,12 @@ netifd_delete_process(struct netifd_process *proc)
        if (proc->uloop.pending)
                uloop_process_delete(&proc->uloop);
        list_del(&proc->list);
-       netifd_fd_delete(&proc->log_fd);
+       uloop_fd_delete(&proc->log_uloop);
+       close(proc->log_uloop.fd);
+       if (proc->log_buf) {
+               free(proc->log_buf);
+               proc->log_buf = NULL;
+       }
 }
 
 void
@@ -77,17 +94,16 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
        if (!proc->log_buf)
                proc->log_buf = malloc(LOG_BUF_SIZE + 1);
 
-       buf = proc->log_buf + proc->log_buf_ofs;
-       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
        log_prefix = proc->log_prefix;
        if (!log_prefix)
                log_prefix = "process";
 
 retry:
+       buf = proc->log_buf + proc->log_buf_ofs;
+       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
        read_len = len = read(fd->fd, buf, maxlen);
        if (len < 0) {
-               if (errno == EAGAIN)
+               if (errno == EINTR)
                        goto retry;
 
                goto out;
@@ -96,9 +112,13 @@ retry:
 
        proc->log_buf_ofs += len;
 
-       cur = buf;
+       len = proc->log_buf_ofs;
        buf = proc->log_buf;
-       while (len > 0 && (cur = memchr(cur, '\n', len))) {
+       while (len > 0) {
+               cur = memchr(buf, '\n', len);
+               if (!cur)
+                       break;
+
                *cur = 0;
 
                if (!proc->log_overflow)
@@ -113,7 +133,7 @@ retry:
        }
 
        if (buf > proc->log_buf && len > 0)
-               memmove(buf, proc->log_buf, len);
+               memmove(proc->log_buf, buf, len);
 
        if (len == LOG_BUF_SIZE) {
                if (!proc->log_overflow) {
@@ -126,7 +146,7 @@ retry:
        }
        proc->log_buf_ofs = len;
 
-       if (read_len == maxlen)
+       if (read_len > 0)
                goto retry;
 
 out:
@@ -147,7 +167,6 @@ netifd_process_cb(struct uloop_process *proc, int ret)
 int
 netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 {
-       struct netifd_fd *fd;
        int pfds[2];
        int pid;
 
@@ -169,13 +188,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                if (proc->dir_fd >= 0)
                        fchdir(proc->dir_fd);
 
-               /* close all non-essential fds */
-               list_for_each_entry(fd, &fds, list) {
-                       if (fd->proc == proc)
-                               continue;
-                       close(fd->fd);
-               }
-
                dup2(pfds[1], 0);
                dup2(pfds[1], 1);
                dup2(pfds[1], 2);
@@ -196,9 +208,10 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
        uloop_process_add(&proc->uloop);
        list_add_tail(&proc->list, &process_list);
 
-       proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
+       system_fd_set_cloexec(pfds[0]);
+       proc->log_buf_ofs = 0;
+       proc->log_uloop.fd = pfds[0];
        proc->log_uloop.cb = netifd_process_log_cb;
-       netifd_fd_add(&proc->log_fd);
        uloop_fd_add(&proc->log_uloop, ULOOP_EDGE_TRIGGER | ULOOP_READ);
 
        return 0;
@@ -215,22 +228,10 @@ netifd_kill_process(struct netifd_process *proc)
        if (!proc->uloop.pending)
                return;
 
-       kill(proc->uloop.pid, SIGTERM);
+       kill(proc->uloop.pid, SIGKILL);
        netifd_delete_process(proc);
 }
 
-void
-netifd_fd_add(struct netifd_fd *fd)
-{
-       list_add_tail(&fd->list, &fds);
-}
-
-void
-netifd_fd_delete(struct netifd_fd *fd)
-{
-       list_del(&fd->list);
-}
-
 static void netifd_do_restart(struct uloop_timeout *timeout)
 {
        execvp(global_argv[0], global_argv);