diff --git a/server/include/file.h b/server/include/file.h index 97a12b1b2..4b9beaf7d 100644 --- a/server/include/file.h +++ b/server/include/file.h @@ -12,8 +12,6 @@ #ifndef _FILE_H_ #define _FILE_H_ -#include - #include "node.h" struct file { diff --git a/server/src/cfg.c b/server/src/cfg.c index 3161938f4..366635e8f 100644 --- a/server/src/cfg.c +++ b/server/src/cfg.c @@ -167,7 +167,7 @@ int config_parse_path(config_setting_t *cfg, list_push(paths, p); } else { - char buf[33]; + char buf[128]; path_print(p, buf, sizeof(buf)); warn("Path %s is not enabled", buf); diff --git a/server/src/file.c b/server/src/file.c index 701737ac3..69d6479fa 100644 --- a/server/src/file.c +++ b/server/src/file.c @@ -27,7 +27,7 @@ int file_print(struct node *n, char *buf, int len) { struct file *f = n->file; - return snprintf(buf, len, "in=%s, out=%s, mode=%s, rate=%f", + return snprintf(buf, len, "in=%s, out=%s, mode=%s, rate=%.1f", f->path_in, f->path_out, f->mode, f->rate); } @@ -102,7 +102,7 @@ int file_read(struct node *n, struct msg *pool, int poolsize, int first, int cnt if (f->in) { /* Blocking for 1/f->rate seconds */ if (timerfd_wait(f->tfd)) { - for (i=0; iin, m); @@ -121,7 +121,7 @@ int file_write(struct node *n, struct msg *pool, int poolsize, int first, int cn struct file *f = n->file; if (f->out) { - for (i=0; iout, m); diff --git a/server/src/path.c b/server/src/path.c index ad00f3252..c4bc4d98d 100644 --- a/server/src/path.c +++ b/server/src/path.c @@ -69,8 +69,10 @@ static void * path_run(void *arg) /* Allocate memory for message pool */ p->pool = alloc(p->poolsize * sizeof(struct msg)); + p->previous = p->current = p->pool; /* Open deferred TCP connection + TODO: fix this node_start_defer(p->in); FOREACH(&p->destinations, it)