diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-06-12 22:57:15 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-06-14 15:40:22 +0200 |
| commit | dacb75f5c04b19e142762c81d5b13d3005c57c71 (patch) | |
| tree | 12c863a85455b2354854c01880b756f31d1c9b11 /src/swanctl/commands/log.c | |
| parent | 12d618e280c4e8c54d94ecddf23ef937a3cbae39 (diff) | |
| download | strongswan-dacb75f5c04b19e142762c81d5b13d3005c57c71.tar.bz2 strongswan-dacb75f5c04b19e142762c81d5b13d3005c57c71.tar.xz | |
Split swanctl --raw mode into single-line and --pretty mode
Diffstat (limited to 'src/swanctl/commands/log.c')
| -rw-r--r-- | src/swanctl/commands/log.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/swanctl/commands/log.c b/src/swanctl/commands/log.c index 10a748f1f..99ba328a7 100644 --- a/src/swanctl/commands/log.c +++ b/src/swanctl/commands/log.c @@ -19,11 +19,11 @@ #include <unistd.h> CALLBACK(log_cb, void, - bool *raw, char *name, vici_res_t *msg) + command_format_options_t *format, char *name, vici_res_t *msg) { - if (*raw) + if (*format & COMMAND_FORMAT_RAW) { - vici_dump(msg, "log", stdout); + vici_dump(msg, "log", *format & COMMAND_FORMAT_PRETTY, stdout); } else { @@ -48,7 +48,7 @@ CALLBACK(log_cb, void, static int logcmd(vici_conn_t *conn) { - bool raw = FALSE; + command_format_options_t format = COMMAND_FORMAT_NONE; char *arg; while (TRUE) @@ -57,8 +57,11 @@ static int logcmd(vici_conn_t *conn) { case 'h': return command_usage(NULL); + case 'P': + format |= COMMAND_FORMAT_PRETTY; + /* fall through to raw */ case 'r': - raw = TRUE; + format |= COMMAND_FORMAT_RAW; continue; case EOF: break; @@ -68,7 +71,7 @@ static int logcmd(vici_conn_t *conn) break; } - if (vici_register(conn, "log", log_cb, &raw) != 0) + if (vici_register(conn, "log", log_cb, &format) != 0) { fprintf(stderr, "registering for log failed: %s\n", strerror(errno)); return errno; @@ -88,10 +91,11 @@ static void __attribute__ ((constructor))reg() { command_register((command_t) { logcmd, 'T', "log", "trace logging output", - {"[--raw]"}, + {"[--raw|--pretty]"}, { {"help", 'h', 0, "show usage information"}, {"raw", 'r', 0, "dump raw response message"}, + {"pretty", 'P', 0, "dump raw response message in pretty print"}, } }); } |