denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swanctl: Add --reauth option to --rekey command

Browse Source
This commit is contained in:
Tobias Brunner
2018-08-31 12:39:46 +02:00
parent a20527438a
commit 8505c28289
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/swanctl/commands/rekey.c
+11 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 Tobias Brunner * Copyright (C) 2017-2018 Tobias Brunner
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@ static int rekey(vici_conn_t *conn)
command_format_options_t format = COMMAND_FORMAT_NONE; command_format_options_t format = COMMAND_FORMAT_NONE;
char *arg, *child = NULL, *ike = NULL; char *arg, *child = NULL, *ike = NULL;
int ret = 0, child_id = 0, ike_id = 0; int ret = 0, child_id = 0, ike_id = 0;
bool reauth = FALSE;
while (TRUE) while (TRUE)
{ {
@@ -49,6 +50,9 @@ static int rekey(vici_conn_t *conn)
case 'I': case 'I':
ike_id = atoi(arg); ike_id = atoi(arg);
continue; continue;
case 'a':
reauth = TRUE;
continue;
case EOF: case EOF:
break; break;
default: default:
@@ -74,6 +78,10 @@ static int rekey(vici_conn_t *conn)
{ {
vici_add_key_valuef(req, "ike-id", "%d", ike_id); vici_add_key_valuef(req, "ike-id", "%d", ike_id);
} }
if (reauth)
{
vici_add_key_valuef(req, "reauth", "yes");
}
res = vici_submit(req, conn); res = vici_submit(req, conn);
if (!res) if (!res)
{ {
@@ -111,13 +119,14 @@ static void __attribute__ ((constructor))reg()
command_register((command_t) { command_register((command_t) {
rekey, 'R', "rekey", "rekey an SA", rekey, 'R', "rekey", "rekey an SA",
{"--child <name> | --ike <name | --child-id <id> | --ike-id <id>", {"--child <name> | --ike <name | --child-id <id> | --ike-id <id>",
"[--raw|--pretty]"}, "[--reauth] [--raw|--pretty]"},
{ {
{"help", 'h', 0, "show usage information"}, {"help", 'h', 0, "show usage information"},
{"child", 'c', 1, "rekey by CHILD_SA name"}, {"child", 'c', 1, "rekey by CHILD_SA name"},
{"ike", 'i', 1, "rekey by IKE_SA name"}, {"ike", 'i', 1, "rekey by IKE_SA name"},
{"child-id", 'C', 1, "rekey by CHILD_SA unique identifier"}, {"child-id", 'C', 1, "rekey by CHILD_SA unique identifier"},
{"ike-id", 'I', 1, "rekey by IKE_SA unique identifier"}, {"ike-id", 'I', 1, "rekey by IKE_SA unique identifier"},
{"reauth", 'a', 0, "reauthenticate instead of rekey an IKEv2 SA"},
{"raw", 'r', 0, "dump raw response message"}, {"raw", 'r', 0, "dump raw response message"},
{"pretty", 'P', 0, "dump raw response message in pretty print"}, {"pretty", 'P', 0, "dump raw response message in pretty print"},
} }