+/*
+ * 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>
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
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 (errno == EAGAIN)
+ if (errno == EINTR)
goto retry;
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)
}
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_ofs = len;
- if (read_len == maxlen)
+ if (read_len > 0)
goto retry;
out:
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);
if (!proc->uloop.pending)
return;
- kill(proc->uloop.pid, SIGTERM);
+ kill(proc->uloop.pid, SIGKILL);
netifd_delete_process(proc);
}
static void netifd_do_reload(struct uloop_timeout *timeout)
{
- config_init_interfaces();
+ config_init_all();
}
static struct uloop_timeout main_timer;
return 1;
}
- config_init_interfaces();
+ config_init_all();
uloop_run();
netifd_kill_processes();