+/*
+ * 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>
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
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;
{
struct netifd_process *proc;
const char *log_prefix;
- char *buf, *start, *cur;
+ char *buf, *cur;
int maxlen, len, read_len;
proc = container_of(fd, struct netifd_process, log_uloop);
proc->log_buf_ofs += len;
- cur = buf;
- start = proc->log_buf;
+ len = proc->log_buf_ofs;
+ buf = proc->log_buf;
while (len > 0) {
- cur = memchr(cur, '\n', len);
+ cur = memchr(buf, '\n', len);
if (!cur)
break;
if (!proc->log_overflow)
netifd_log_message(L_NOTICE, "%s (%d): %s\n",
- log_prefix, proc->uloop.pid, start);
+ log_prefix, proc->uloop.pid, buf);
else
proc->log_overflow = false;
cur++;
len -= cur - buf;
- buf = start = cur;
+ buf = cur;
}
if (buf > proc->log_buf && len > 0)
int
netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
{
- struct netifd_fd *fd;
int pfds[2];
int pid;
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);
uloop_process_add(&proc->uloop);
list_add_tail(&proc->list, &process_list);
+ system_fd_set_cloexec(pfds[0]);
proc->log_buf_ofs = 0;
- proc->log_uloop.fd = proc->log_fd.fd = pfds[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;
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);