Add --log-file

This commit is contained in:
Ian Gulliver
2016-03-07 11:26:25 -08:00
parent 51eaabe27a
commit 46696933aa
15 changed files with 110 additions and 61 deletions

View File

@@ -17,7 +17,7 @@
#include "opts.h"
static char *opts_split(char **arg, char delim) {
static char *opts_split(const char **arg, char delim) {
char *split = strchr(*arg, delim);
if (!split) {
return NULL;
@@ -27,7 +27,7 @@ static char *opts_split(char **arg, char delim) {
return ret;
}
static bool opts_add_listen(char *host_port, struct flow *flow, void *passthrough) {
static bool opts_add_listen(const char *host_port, struct flow *flow, void *passthrough) {
char *host = opts_split(&host_port, '/');
if (host) {
incoming_new(host, host_port, flow, passthrough);
@@ -38,7 +38,7 @@ static bool opts_add_listen(char *host_port, struct flow *flow, void *passthroug
return true;
}
static bool opts_add_connect(char *host_port, struct flow *flow, void *passthrough) {
static bool opts_add_connect(const char *host_port, struct flow *flow, void *passthrough) {
char *host = opts_split(&host_port, '/');
if (!host) {
return false;
@@ -49,22 +49,22 @@ static bool opts_add_connect(char *host_port, struct flow *flow, void *passthrou
return true;
}
static bool opts_add_file_write_int(char *path, struct flow *flow, void *passthrough) {
static bool opts_add_file_write_int(const char *path, struct flow *flow, void *passthrough) {
file_write_new(path, flow, passthrough);
return true;
}
static bool opts_add_file_append_int(char *path, struct flow *flow, void *passthrough) {
static bool opts_add_file_append_int(const char *path, struct flow *flow, void *passthrough) {
file_append_new(path, flow, passthrough);
return true;
}
static bool opts_add_exec(char *cmd, struct flow *flow, void *passthrough) {
static bool opts_add_exec(const char *cmd, struct flow *flow, void *passthrough) {
exec_new(cmd, flow, passthrough);
return true;
}
static struct serializer *opts_get_serializer(char **arg) {
static struct serializer *opts_get_serializer(const char **arg) {
char *format = opts_split(arg, '=');
if (!format) {
return NULL;
@@ -79,7 +79,7 @@ static struct serializer *opts_get_serializer(char **arg) {
return serializer;
}
static bool opts_add_send(bool (*next)(char *, struct flow *, void *), struct flow *flow, char *arg) {
static bool opts_add_send(bool (*next)(const char *, struct flow *, void *), struct flow *flow, const char *arg) {
struct serializer *serializer = opts_get_serializer(&arg);
if (!serializer) {
return false;
@@ -87,71 +87,71 @@ static bool opts_add_send(bool (*next)(char *, struct flow *, void *), struct fl
return next(arg, flow, serializer);
}
bool opts_add_connect_receive(char *arg) {
bool opts_add_connect_receive(const char *arg) {
return opts_add_connect(arg, receive_flow, NULL);
}
bool opts_add_connect_send(char *arg) {
bool opts_add_connect_send(const char *arg) {
return opts_add_send(opts_add_connect, send_flow, arg);
}
bool opts_add_connect_send_receive(char *arg) {
bool opts_add_connect_send_receive(const char *arg) {
return opts_add_send(opts_add_connect, send_receive_flow, arg);
}
bool opts_add_listen_receive(char *arg) {
bool opts_add_listen_receive(const char *arg) {
return opts_add_listen(arg, receive_flow, NULL);
}
bool opts_add_listen_send(char *arg) {
bool opts_add_listen_send(const char *arg) {
return opts_add_send(opts_add_listen, send_flow, arg);
}
bool opts_add_listen_send_receive(char *arg) {
bool opts_add_listen_send_receive(const char *arg) {
return opts_add_send(opts_add_listen, send_receive_flow, arg);
}
bool opts_add_file_read(char *arg) {
bool opts_add_file_read(const char *arg) {
file_read_new(arg, receive_flow, NULL);
return true;
}
bool opts_add_file_write(char *arg) {
bool opts_add_file_write(const char *arg) {
return opts_add_send(opts_add_file_write_int, send_flow, arg);
}
bool opts_add_file_write_read(char *arg) {
bool opts_add_file_write_read(const char *arg) {
return opts_add_send(opts_add_file_write_int, send_receive_flow, arg);
}
bool opts_add_file_append(char *arg) {
bool opts_add_file_append(const char *arg) {
return opts_add_send(opts_add_file_append_int, send_flow, arg);
}
bool opts_add_file_append_read(char *arg) {
bool opts_add_file_append_read(const char *arg) {
return opts_add_send(opts_add_file_append_int, send_receive_flow, arg);
}
bool opts_add_exec_receive(char *arg) {
bool opts_add_exec_receive(const char *arg) {
exec_new(arg, receive_flow, NULL);
return true;
}
bool opts_add_exec_send(char *arg) {
bool opts_add_exec_send(const char *arg) {
return opts_add_send(opts_add_exec, send_flow, arg);
}
bool opts_add_exec_send_receive(char *arg) {
bool opts_add_exec_send_receive(const char *arg) {
return opts_add_send(opts_add_exec, send_receive_flow, arg);
}
bool opts_add_stdin(char __attribute__((unused)) *arg) {
bool opts_add_stdin(const char __attribute__((unused)) *arg) {
int fd = fcntl(STDIN_FILENO, F_DUPFD_CLOEXEC, 0);
assert(fd >= 0);
return flow_new_send_hello(fd, receive_flow, NULL, NULL);
}
bool opts_add_stdout(char *arg) {
bool opts_add_stdout(const char *arg) {
struct serializer *serializer = send_get_serializer(arg);
if (!serializer) {
return false;