projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix log buffer overflow handling
[project/netifd.git]
/
main.c
diff --git
a/main.c
b/main.c
index
42f50a3
..
3fe38bf
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-46,6
+46,10
@@
netifd_delete_process(struct netifd_process *proc)
uloop_process_delete(&proc->uloop);
list_del(&proc->list);
netifd_fd_delete(&proc->log_fd);
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;
+ }
}
void
}
void
@@
-77,17
+81,16
@@
netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
if (!proc->log_buf)
proc->log_buf = malloc(LOG_BUF_SIZE + 1);
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:
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) {
read_len = len = read(fd->fd, buf, maxlen);
if (len < 0) {
- if (errno == E
AGAIN
)
+ if (errno == E
INTR
)
goto retry;
goto out;
goto retry;
goto out;
@@
-98,7
+101,7
@@
retry:
cur = buf;
buf = proc->log_buf;
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)
*cur = 0;
if (!proc->log_overflow)
@@
-113,7
+116,7
@@
retry:
}
if (buf > proc->log_buf && len > 0)
}
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) {
if (len == LOG_BUF_SIZE) {
if (!proc->log_overflow) {
@@
-126,7
+129,7
@@
retry:
}
proc->log_buf_ofs = len;
}
proc->log_buf_ofs = len;
- if (read_len
== maxlen
)
+ if (read_len
> 0
)
goto retry;
out:
goto retry;
out:
@@
-196,6
+199,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);
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);
proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
proc->log_uloop.cb = netifd_process_log_cb;
netifd_fd_add(&proc->log_fd);
@@
-215,7
+219,7
@@
netifd_kill_process(struct netifd_process *proc)
if (!proc->uloop.pending)
return;
if (!proc->uloop.pending)
return;
- kill(proc->uloop.pid, SIG
TERM
);
+ kill(proc->uloop.pid, SIG
KILL
);
netifd_delete_process(proc);
}
netifd_delete_process(proc);
}
@@
-238,7
+242,7
@@
static void netifd_do_restart(struct uloop_timeout *timeout)
static void netifd_do_reload(struct uloop_timeout *timeout)
{
static void netifd_do_reload(struct uloop_timeout *timeout)
{
- config_init_
interfaces
();
+ config_init_
all
();
}
static struct uloop_timeout main_timer;
}
static struct uloop_timeout main_timer;
@@
-358,7
+362,7
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- config_init_
interfaces
();
+ config_init_
all
();
uloop_run();
netifd_kill_processes();
uloop_run();
netifd_kill_processes();