X-Git-Url: http://git.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=3f16cd5d3bb56c364074972a1a491f4f19c8f4d2;hp=b07784e8972c40d2ccc51380ae9409391b3c59cf;hb=268149290fcd8a52f377b21226990d3bf0e9c226;hpb=b314737e9a0f0df710ba5e8691882cd7d42faaf5

diff --git a/main.c b/main.c
index b07784e..3f16cd5 100644
--- a/main.c
+++ b/main.c
@@ -4,6 +4,8 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <signal.h>
+#include <stdarg.h>
+#include <syslog.h>
 
 #include "netifd.h"
 #include "ubus.h"
@@ -19,6 +21,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)
 {
@@ -28,6 +48,22 @@ netifd_delete_process(struct netifd_process *proc)
 	netifd_fd_delete(&proc->log_fd);
 }
 
+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)
 {
@@ -50,21 +86,24 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
 
 retry:
 	read_len = len = read(fd->fd, buf, maxlen);
-	if (len <= 0) {
-		if (errno == EINTR)
+	if (len < 0) {
+		if (errno == EAGAIN)
 			goto retry;
 
-		return;
-	}
+		goto out;
+	} else if (len == 0)
+		goto out;
+
 	proc->log_buf_ofs += len;
 
 	cur = buf;
 	buf = proc->log_buf;
-	while ((cur = memchr(cur, '\n', len))) {
+	while (len > 0 && (cur = memchr(cur, '\n', len))) {
 		*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;
 
@@ -79,7 +118,8 @@ retry:
 	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;
@@ -88,6 +128,10 @@ retry:
 
 	if (read_len == maxlen)
 		goto retry;
+
+out:
+	if (fd->eof)
+		uloop_fd_delete(fd);
 }
 
 static void
@@ -194,7 +238,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 +265,10 @@ static int usage(const char *progname)
 		" -p <path>:		Path to netifd addons (default: %s)\n"
 		" -h <path>:		Path to the hotplug script\n"
 		" -r <path>:		Path to resolv.conf\n"
+		" -l <level>:		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 +312,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 +329,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 +358,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;
 }