X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=bbae97b72238e1333b3c3ced59bcb9ac30b75bd4;hp=bed0edd4167c2e25a2e5465cb798bb3c741d81d4;hb=fb2f843edf44c6f12b636cd82cdd1c71e953495f;hpb=26486b46eada232ef807f3d969ffdec33d5e4858 diff --git a/main.c b/main.c index bed0edd..bbae97b 100644 --- a/main.c +++ b/main.c @@ -1,8 +1,20 @@ +/* + * 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 @@ -12,14 +24,16 @@ #include "config.h" #include "system.h" #include "interface.h" +#include "wireless.h" +#include "proto.h" unsigned int debug_mask = 0; const char *main_path = DEFAULT_MAIN_PATH; +const char *config_path = DEFAULT_CONFIG_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 @@ -42,14 +56,9 @@ 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); - netifd_fd_delete(&proc->log_fd); - if (proc->log_buf) { - free(proc->log_buf); - proc->log_buf = NULL; - } + ustream_free(&proc->log.stream); + close(proc->log.fd.fd); } void @@ -69,72 +78,46 @@ netifd_log_message(int priority, const char *format, ...) } static void -netifd_process_log_cb(struct uloop_fd *fd, unsigned int events) +netifd_process_log_read_cb(struct ustream *s, int bytes) { 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); + char *data; + int len = 0; + proc = container_of(s, struct netifd_process, log.stream); 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) - goto retry; + do { + char *newline; - goto out; - } else if (len == 0) - goto out; - - proc->log_buf_ofs += len; + data = ustream_get_read_buf(s, &len); + if (!len) + break; - cur = buf; - buf = proc->log_buf; - while (len > 0 && (cur = memchr(cur, '\n', len))) { - *cur = 0; + newline = strchr(data, '\n'); - if (!proc->log_overflow) + if (proc->log_overflow) { + if (newline) { + len = newline + 1 - data; + proc->log_overflow = false; + } + } else if (newline) { + *newline = 0; + len = newline + 1 - data; 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(buf, proc->log_buf, len); - - if (len == LOG_BUF_SIZE) { - if (!proc->log_overflow) { - proc->log_buf[LOG_BUF_SIZE] = 0; + log_prefix, proc->uloop.pid, data); + } else if (len == s->r.buffer_len) { netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n", - log_prefix, proc->uloop.pid, proc->log_buf); + log_prefix, proc->uloop.pid, data); proc->log_overflow = true; - } - len = 0; - } - proc->log_buf_ofs = len; - - if (read_len > 0) - goto retry; + } else + break; -out: - if (fd->eof) - uloop_fd_delete(fd); + ustream_consume(s, len); + } while (1); } static void @@ -142,7 +125,8 @@ netifd_process_cb(struct uloop_process *proc, int ret) { struct netifd_process *np; np = container_of(proc, struct netifd_process, uloop); - netifd_process_log_cb(&np->log_uloop, 0); + + while (ustream_poll(&np->log.stream)); netifd_delete_process(np); return np->cb(np, ret); } @@ -150,7 +134,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; @@ -163,6 +146,8 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc) goto error; if (!pid) { + int i; + if (env) { while (*env) { putenv(*env); @@ -170,21 +155,19 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc) } } if (proc->dir_fd >= 0) - fchdir(proc->dir_fd); + if (fchdir(proc->dir_fd)) {} + + close(pfds[0]); - /* close all non-essential fds */ - list_for_each_entry(fd, &fds, list) { - if (fd->proc == proc) + for (i = 0; i <= 2; i++) { + if (pfds[1] == i) continue; - close(fd->fd); - } - dup2(pfds[1], 0); - dup2(pfds[1], 1); - dup2(pfds[1], 2); + dup2(pfds[1], i); + } - close(pfds[0]); - close(pfds[1]); + if (pfds[1] > 2) + close(pfds[1]); execvp(argv[0], (char **) argv); exit(127); @@ -199,11 +182,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_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); + system_fd_set_cloexec(pfds[0]); + proc->log.stream.string_data = true; + proc->log.stream.notify_read = netifd_process_log_read_cb; + ustream_fd_init(&proc->log, pfds[0]); return 0; @@ -219,43 +201,27 @@ netifd_kill_process(struct netifd_process *proc) if (!proc->uloop.pending) return; - kill(proc->uloop.pid, SIGTERM); + kill(proc->uloop.pid, SIGKILL); + uloop_process_delete(&proc->uloop); 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); } -static void netifd_do_reload(struct uloop_timeout *timeout) -{ - config_init_all(); -} - -static struct uloop_timeout main_timer; - void netifd_reload(void) { - main_timer.cb = netifd_do_reload; - uloop_timeout_set(&main_timer, 100); + config_init_all(); } void netifd_restart(void) { - main_timer.cb = netifd_do_restart; + static struct uloop_timeout main_timer = { + .cb = netifd_do_restart + }; + interface_set_down(NULL); uloop_timeout_set(&main_timer, 1000); } @@ -267,6 +233,7 @@ static int usage(const char *progname) " -d : Mask for debug messages\n" " -s : Path to the ubus socket\n" " -p : Path to netifd addons (default: %s)\n" + " -c : Path to UCI configuration\n" " -h : Path to the hotplug script\n" " -r : Path to resolv.conf\n" " -l : Log output level (default: %d)\n" @@ -316,7 +283,7 @@ int main(int argc, char **argv) global_argv = argv; - while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) { + while ((ch = getopt(argc, argv, "d:s:p:c:h:r:l:S")) != -1) { switch(ch) { case 'd': debug_mask = strtoul(optarg, NULL, 0); @@ -327,6 +294,9 @@ int main(int argc, char **argv) case 'p': main_path = optarg; break; + case 'c': + config_path = optarg; + break; case 'h': hotplug_cmd_path = optarg; break; @@ -357,6 +327,9 @@ int main(int argc, char **argv) return 1; } + proto_shell_init(); + wireless_init(); + if (system_init()) { fprintf(stderr, "Failed to initialize system control\n"); return 1;