X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=4ee86ebe642530ef2f6d605e10bc000eb38e224b;hp=b07784e8972c40d2ccc51380ae9409391b3c59cf;hb=3e3bc6037848f1d86481e826899c515341c6159d;hpb=b314737e9a0f0df710ba5e8691882cd7d42faaf5 diff --git a/main.c b/main.c index b07784e..4ee86eb 100644 --- a/main.c +++ b/main.c @@ -1,9 +1,24 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * 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 #include #include #include #include #include +#include +#include #include "netifd.h" #include "ubus.h" @@ -19,6 +34,24 @@ 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) { @@ -26,6 +59,27 @@ netifd_delete_process(struct netifd_process *proc) uloop_process_delete(&proc->uloop); list_del(&proc->list); netifd_fd_delete(&proc->log_fd); + close(proc->log_fd.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 @@ -41,30 +95,36 @@ 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 (len < 0) { if (errno == EINTR) goto retry; - return; - } + goto out; + } else if (len == 0) + goto out; + proc->log_buf_ofs += len; - cur = buf; + len = proc->log_buf_ofs; buf = proc->log_buf; - while ((cur = memchr(cur, '\n', len))) { + while (len > 0) { + cur = memchr(buf, '\n', len); + if (!cur) + break; + *cur = 0; if (!proc->log_overflow) - fprintf(stderr, "%s (%d): %s\n", log_prefix, proc->uloop.pid, buf); + netifd_log_message(L_NOTICE, "%s (%d): %s\n", + log_prefix, proc->uloop.pid, buf); else proc->log_overflow = false; @@ -74,20 +134,25 @@ 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) { proc->log_buf[LOG_BUF_SIZE] = 0; - fprintf(stderr, "%s (%d): %s [...]\n", log_prefix, proc->uloop.pid, proc->log_buf); + 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 == maxlen) + if (read_len > 0) goto retry; + +out: + if (fd->eof) + uloop_fd_delete(fd); } static void @@ -152,6 +217,7 @@ 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_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); @@ -171,7 +237,7 @@ 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); } @@ -194,7 +260,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; @@ -221,8 +287,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; } @@ -266,7 +334,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); @@ -283,11 +351,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"); @@ -299,12 +380,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; }