X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=bbec86005ece242888527c139d004e783d1b6f83;hp=04d5648264efd44fa535a48bb1fde96b2cb6de6d;hb=46d52638f04c471a0e86d07ccae6a188f1a05ef5;hpb=8c4dface377cf03de38c642b90940530e47296d3 diff --git a/main.c b/main.c index 04d5648..bbec860 100644 --- a/main.c +++ b/main.c @@ -3,6 +3,9 @@ #include #include #include +#include +#include +#include #include "netifd.h" #include "ubus.h" @@ -14,27 +17,155 @@ unsigned int debug_mask = 0; const char *main_path = DEFAULT_MAIN_PATH; 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 + +static int log_level = DEFAULT_LOG_LEVEL; +static const int log_class[] = { + [L_CRIT] = LOG_CRIT, + [L_WARNING] = LOG_WARNING, + [L_NOTICE] = LOG_NOTICE, + [L_INFO] = LOG_INFO, + [L_DEBUG] = LOG_DEBUG +}; + +#ifdef DUMMY_MODE +#define use_syslog false +#else +static bool use_syslog = true; +#endif + + +static void +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); + if (proc->log_buf) { + free(proc->log_buf); + proc->log_buf = NULL; + } +} + +void +netifd_log_message(int priority, const char *format, ...) +{ + va_list vl; + + if (priority > log_level) + return; + + va_start(vl, format); + if (use_syslog) + vsyslog(log_class[priority], format, vl); + else + vfprintf(stderr, format, vl); + va_end(vl); +} + +static void +netifd_process_log_cb(struct uloop_fd *fd, unsigned int events) +{ + struct netifd_process *proc; + const char *log_prefix; + char *buf, *cur; + int maxlen, len, read_len; + + proc = container_of(fd, struct netifd_process, log_uloop); + + if (!proc->log_buf) + proc->log_buf = malloc(LOG_BUF_SIZE + 1); + + 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 == EINTR) + goto retry; + + goto out; + } else if (len == 0) + goto out; + + proc->log_buf_ofs += len; + + len = proc->log_buf_ofs; + buf = proc->log_buf; + while (len > 0) { + cur = memchr(buf, '\n', len); + if (!cur) + break; + + *cur = 0; + + if (!proc->log_overflow) + netifd_log_message(L_NOTICE, "%s (%d): %s\n", + log_prefix, proc->uloop.pid, buf); + else + proc->log_overflow = false; + + cur++; + len -= cur - buf; + buf = cur; + } + + if (buf > proc->log_buf && len > 0) + memmove(proc->log_buf, buf, len); + + if (len == LOG_BUF_SIZE) { + if (!proc->log_overflow) { + proc->log_buf[LOG_BUF_SIZE] = 0; + netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n", + log_prefix, proc->uloop.pid, proc->log_buf); + proc->log_overflow = true; + } + len = 0; + } + proc->log_buf_ofs = len; + + if (read_len > 0) + goto retry; + +out: + if (fd->eof) + uloop_fd_delete(fd); +} static void netifd_process_cb(struct uloop_process *proc, int ret) { struct netifd_process *np; np = container_of(proc, struct netifd_process, uloop); - list_del(&np->list); + netifd_process_log_cb(&np->log_uloop, 0); + netifd_delete_process(np); return np->cb(np, ret); } int netifd_start_process(const char **argv, char **env, struct netifd_process *proc) { + struct netifd_fd *fd; + int pfds[2]; int pid; netifd_kill_process(proc); - if ((pid = fork()) < 0) + if (pipe(pfds) < 0) return -1; + if ((pid = fork()) < 0) + goto error; + if (!pid) { if (env) { while (*env) { @@ -44,19 +175,46 @@ 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); + + close(pfds[0]); + close(pfds[1]); + execvp(argv[0], (char **) argv); exit(127); } if (pid < 0) - return -1; + goto error; + close(pfds[1]); proc->uloop.cb = netifd_process_cb; proc->uloop.pid = pid; uloop_process_add(&proc->uloop); list_add_tail(&proc->list, &process_list); + proc->log_buf_ofs = 0; + proc->log_uloop.fd = proc->log_fd.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; + +error: + close(pfds[0]); + close(pfds[1]); + return -1; } void @@ -65,9 +223,20 @@ netifd_kill_process(struct netifd_process *proc) if (!proc->uloop.pending) return; - kill(proc->uloop.pid, SIGTERM); - uloop_process_delete(&proc->uloop); - list_del(&proc->list); + 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) @@ -77,7 +246,7 @@ static void netifd_do_restart(struct uloop_timeout *timeout) static void netifd_do_reload(struct uloop_timeout *timeout) { - config_init_interfaces(NULL); + config_init_all(); } static struct uloop_timeout main_timer; @@ -104,8 +273,10 @@ static int usage(const char *progname) " -p : Path to netifd addons (default: %s)\n" " -h : Path to the hotplug script\n" " -r : Path to resolv.conf\n" + " -l : Log output level (default: %d)\n" + " -S: Use stderr instead of syslog for log messages\n" " (default: "DEFAULT_HOTPLUG_PATH")\n" - "\n", progname, main_path); + "\n", progname, main_path, DEFAULT_LOG_LEVEL); return 1; } @@ -128,6 +299,9 @@ netifd_setup_signals(void) sigaction(SIGTERM, &s, NULL); sigaction(SIGUSR1, &s, NULL); sigaction(SIGUSR2, &s, NULL); + + s.sa_handler = SIG_IGN; + sigaction(SIGPIPE, &s, NULL); } static void @@ -146,7 +320,7 @@ int main(int argc, char **argv) global_argv = argv; - while ((ch = getopt(argc, argv, "d:s:p:h:r:")) != -1) { + while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) { switch(ch) { case 'd': debug_mask = strtoul(optarg, NULL, 0); @@ -163,11 +337,24 @@ int main(int argc, char **argv) case 'r': resolv_conf = optarg; break; + case 'l': + log_level = atoi(optarg); + if (log_level >= ARRAY_SIZE(log_class)) + log_level = ARRAY_SIZE(log_class) - 1; + break; +#ifndef DUMMY_MODE + case 'S': + use_syslog = false; + break; +#endif default: return usage(argv[0]); } } + if (use_syslog) + openlog("netifd", 0, LOG_DAEMON); + netifd_setup_signals(); if (netifd_ubus_init(socket) < 0) { fprintf(stderr, "Failed to connect to ubus\n"); @@ -179,12 +366,15 @@ int main(int argc, char **argv) return 1; } - config_init_interfaces(NULL); + config_init_all(); uloop_run(); netifd_kill_processes(); netifd_ubus_done(); + if (use_syslog) + closelog(); + return 0; }