swanctl: Add a --reload-settings command
This commit is contained in:
parent
455e213cb0
commit
214a859cd6
|
@ -16,6 +16,7 @@ swanctl_SOURCES = \
|
|||
commands/log.c \
|
||||
commands/version.c \
|
||||
commands/stats.c \
|
||||
commands/reload_settings.c \
|
||||
swanctl.c swanctl.h
|
||||
|
||||
swanctl_LDADD = \
|
||||
|
|
|
@ -220,7 +220,7 @@ int command_usage(char *error, ...)
|
|||
{
|
||||
for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
|
||||
{
|
||||
fprintf(out, " swanctl --%-10s (-%c) %s\n",
|
||||
fprintf(out, " swanctl --%-15s (-%c) %s\n",
|
||||
cmds[i].cmd, cmds[i].op, cmds[i].description);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
/**
|
||||
* Maximum number of commands (+1).
|
||||
*/
|
||||
#define MAX_COMMANDS 16
|
||||
#define MAX_COMMANDS 17
|
||||
|
||||
/**
|
||||
* Maximum number of options in a command (+3)
|
||||
|
|
|
@ -0,0 +1,87 @@
|
|||
/*
|
||||
* Copyright (C) 2014 Martin Willi
|
||||
* Copyright (C) 2014 revosec AG
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* 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 "command.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
static int reload_settings(vici_conn_t *conn)
|
||||
{
|
||||
vici_req_t *req;
|
||||
vici_res_t *res;
|
||||
char *arg;
|
||||
int ret = 0;
|
||||
command_format_options_t format = COMMAND_FORMAT_NONE;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
switch (command_getopt(&arg))
|
||||
{
|
||||
case 'h':
|
||||
return command_usage(NULL);
|
||||
case 'P':
|
||||
format |= COMMAND_FORMAT_PRETTY;
|
||||
/* fall through to raw */
|
||||
case 'r':
|
||||
format |= COMMAND_FORMAT_RAW;
|
||||
continue;
|
||||
case EOF:
|
||||
break;
|
||||
default:
|
||||
return command_usage("invalid --reload-settings option");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
req = vici_begin("reload-settings");
|
||||
res = vici_submit(req, conn);
|
||||
if (!res)
|
||||
{
|
||||
fprintf(stderr, "reload-settings request failed: %s\n", strerror(errno));
|
||||
return errno;
|
||||
}
|
||||
if (format & COMMAND_FORMAT_RAW)
|
||||
{
|
||||
vici_dump(res, "reload-settings reply",
|
||||
format & COMMAND_FORMAT_PRETTY, stdout);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!streq(vici_find_str(res, "no", "success"), "yes"))
|
||||
{
|
||||
fprintf(stderr, "reload-settings failed: %s\n",
|
||||
vici_find_str(res, "", "errmsg"));
|
||||
ret = 1;
|
||||
}
|
||||
}
|
||||
vici_free_res(res);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the command.
|
||||
*/
|
||||
static void __attribute__ ((constructor))reg()
|
||||
{
|
||||
command_register((command_t) {
|
||||
reload_settings, 'r', "reload-settings", "reload daemon strongswan.conf",
|
||||
{"[--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"},
|
||||
}
|
||||
});
|
||||
}
|
|
@ -77,6 +77,9 @@ trace logging output
|
|||
.B "\-S, \-\-stats"
|
||||
show daemon infos and statistics
|
||||
.TP
|
||||
.B "\-r, \-\-reload-settings"
|
||||
reload strongswan.conf(5) configuration
|
||||
.TP
|
||||
.B "\-v, \-\-version"
|
||||
show daemon version information
|
||||
.TP
|
||||
|
|
Loading…
Reference in New Issue