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:
Martin Willi
2014-05-07 15:48:17 +02:00
parent 92884b4683
commit b1076bc8fd
+12 -2
View File
@@ -22,7 +22,7 @@ static int version(vici_conn_t *conn)
vici_req_t *req; vici_req_t *req;
vici_res_t *res; vici_res_t *res;
char *arg; char *arg;
bool raw = FALSE; bool raw = FALSE, daemon = FALSE;;
while (TRUE) while (TRUE)
{ {
@@ -33,6 +33,9 @@ static int version(vici_conn_t *conn)
case 'r': case 'r':
raw = TRUE; raw = TRUE;
continue; continue;
case 'd':
daemon = TRUE;
continue;
case EOF: case EOF:
break; break;
default: default:
@@ -41,6 +44,12 @@ static int version(vici_conn_t *conn)
break; break;
} }
if (!daemon)
{
printf("strongSwan swanctl %s\n", VERSION);
return 0;
}
req = vici_begin("version"); req = vici_begin("version");
res = vici_submit(req, conn); res = vici_submit(req, conn);
if (!res) if (!res)
@@ -71,10 +80,11 @@ static int version(vici_conn_t *conn)
static void __attribute__ ((constructor))reg() static void __attribute__ ((constructor))reg()
{ {
command_register((command_t) { command_register((command_t) {
version, 'v', "version", "show daemon version information", version, 'v', "version", "show version information",
{"[--raw]"}, {"[--raw]"},
{ {
{"help", 'h', 0, "show usage information"}, {"help", 'h', 0, "show usage information"},
{"daemon", 'd', 0, "query daemon version"},
{"raw", 'r', 0, "dump raw response message"}, {"raw", 'r', 0, "dump raw response message"},
} }
}); });