swanctl: By default print local swanctl version with --version
But add a --daemon option to query the IKE daemon for its version.
This commit is contained in:
parent
92884b4683
commit
b1076bc8fd
|
@ -22,7 +22,7 @@ static int version(vici_conn_t *conn)
|
|||
vici_req_t *req;
|
||||
vici_res_t *res;
|
||||
char *arg;
|
||||
bool raw = FALSE;
|
||||
bool raw = FALSE, daemon = FALSE;;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
|
@ -33,6 +33,9 @@ static int version(vici_conn_t *conn)
|
|||
case 'r':
|
||||
raw = TRUE;
|
||||
continue;
|
||||
case 'd':
|
||||
daemon = TRUE;
|
||||
continue;
|
||||
case EOF:
|
||||
break;
|
||||
default:
|
||||
|
@ -41,6 +44,12 @@ static int version(vici_conn_t *conn)
|
|||
break;
|
||||
}
|
||||
|
||||
if (!daemon)
|
||||
{
|
||||
printf("strongSwan swanctl %s\n", VERSION);
|
||||
return 0;
|
||||
}
|
||||
|
||||
req = vici_begin("version");
|
||||
res = vici_submit(req, conn);
|
||||
if (!res)
|
||||
|
@ -71,10 +80,11 @@ static int version(vici_conn_t *conn)
|
|||
static void __attribute__ ((constructor))reg()
|
||||
{
|
||||
command_register((command_t) {
|
||||
version, 'v', "version", "show daemon version information",
|
||||
version, 'v', "version", "show version information",
|
||||
{"[--raw]"},
|
||||
{
|
||||
{"help", 'h', 0, "show usage information"},
|
||||
{"daemon", 'd', 0, "query daemon version"},
|
||||
{"raw", 'r', 0, "dump raw response message"},
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue