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

swanctl: Do not display rekey times for shunts

Browse Source
This commit is contained in:
Andreas Steffen
2016-05-05 14:53:22 +02:00
parent d95f2ab0cf
commit b9522f9d64
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/swanctl/commands/list_conns.c
+5 -3
View File
@@ -83,7 +83,7 @@ CALLBACK(children_sn, int,
hashtable_t *ike, vici_res_t *res, char *name) hashtable_t *ike, vici_res_t *res, char *name)
{ {
hashtable_t *child; hashtable_t *child;
char *interface, *priority; char *mode, *interface, *priority;
char *rekey_time, *rekey_bytes, *rekey_packets; char *rekey_time, *rekey_bytes, *rekey_packets;
bool no_time, no_bytes, no_packets, or = FALSE; bool no_time, no_bytes, no_packets, or = FALSE;
int ret; int ret;
@@ -92,7 +92,8 @@ CALLBACK(children_sn, int,
ret = vici_parse_cb(res, NULL, values, list, child); ret = vici_parse_cb(res, NULL, values, list, child);
if (ret == 0) if (ret == 0)
{ {
printf(" %s: %s, ", name, child->get(child, "mode")); mode = child->get(child, "mode");
printf(" %s: %s, ", name, mode);
rekey_time = child->get(child, "rekey_time"); rekey_time = child->get(child, "rekey_time");
rekey_bytes = child->get(child, "rekey_bytes"); rekey_bytes = child->get(child, "rekey_bytes");
@@ -101,7 +102,8 @@ CALLBACK(children_sn, int,
no_bytes = streq(rekey_bytes, "0"); no_bytes = streq(rekey_bytes, "0");
no_packets = streq(rekey_packets, "0"); no_packets = streq(rekey_packets, "0");
if (no_time && no_bytes && no_packets) if (strcaseeq(mode, "PASS") || strcaseeq(mode, "DROP") ||
(no_time && no_bytes && no_packets))
{ {
printf("no rekeying\n"); printf("no rekeying\n");
} }
testing/tests/swanctl/manual-prio/hosts/moon/etc/swanctl/swanctl.conf
+1
View File
@@ -25,6 +25,7 @@ connections {
} }
shunts { shunts {
rekey_time = 0
children { children {
drop-eth0-default { drop-eth0-default {