X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=4ee86ebe642530ef2f6d605e10bc000eb38e224b;hp=02fd9ffa1b7b08135408b8fdf89c2c2fa9422085;hb=19ab568942e2699a414bd7bf3d53823c9b707abb;hpb=2f976c53919e49b9008e9d5f23349be3c992e87b

diff --git a/main.c b/main.c
index 02fd9ff..4ee86eb 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,16 @@
+/*
+ * 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>
@@ -23,14 +36,6 @@ static struct list_head fds = LIST_HEAD_INIT(fds);
 
 #define DEFAULT_LOG_LEVEL L_NOTICE
 
-enum {
-	L_CRIT,
-	L_WARNING,
-	L_NOTICE,
-	L_INFO,
-	L_DEBUG
-};
-
 static int log_level = DEFAULT_LOG_LEVEL;
 static const int log_class[] = {
 	[L_CRIT] = LOG_CRIT,
@@ -54,6 +59,11 @@ 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
@@ -85,26 +95,31 @@ 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)
@@ -119,7 +134,7 @@ 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) {
@@ -132,8 +147,12 @@ retry:
 	}
 	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
@@ -198,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);
@@ -217,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);
 }
 
@@ -240,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;
@@ -360,7 +380,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	config_init_interfaces(NULL);
+	config_init_all();
 
 	uloop_run();
 	netifd_kill_processes();