summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-02-11 15:05:47 +0100
committerThomas Haller <thaller@redhat.com>2019-02-13 16:03:23 +0100
commitff456d5e96dda7b99011c98cc0d3c80d48a5227e (patch)
tree35732416a81e7c3325e4e6c3a96243d7757e645e
parent05d5efd561b04f004f9fc35c3d8ee142710ebe18 (diff)
downloadNetworkManager-th/various-for-wireguard-3.tar.gz
platform: print persistent-keepalive setting of WireGuard peersth/various-for-wireguard-3
-rw-r--r--src/platform/nm-platform.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index b99eb489ef..10bf417968 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -5633,6 +5633,7 @@ nm_platform_wireguard_peer_to_string (const NMPWireGuardPeer *peer, char *buf, g
char s_sockaddr[NM_UTILS_INET_ADDRSTRLEN + 100];
char s_endpoint[20 + sizeof (s_sockaddr)];
char s_addr[NM_UTILS_INET_ADDRSTRLEN];
+ char s_keepalive[100];
guint i;
nm_utils_to_string_buffer_init (&buf, &len);
@@ -5650,10 +5651,11 @@ nm_platform_wireguard_peer_to_string (const NMPWireGuardPeer *peer, char *buf, g
nm_utils_strbuf_append (&buf, &len,
"public-key %s"
- "%s" /* preshared-key */
- "%s" /* endpoint */
+ "%s" /* preshared-key */
+ "%s" /* endpoint */
" rx %"G_GUINT64_FORMAT
" tx %"G_GUINT64_FORMAT
+ "%s" /* persistent-keepalive */
"%s", /* allowed-ips */
public_key_b64,
nm_utils_memeqzero (peer->preshared_key, sizeof (peer->preshared_key))
@@ -5662,6 +5664,9 @@ nm_platform_wireguard_peer_to_string (const NMPWireGuardPeer *peer, char *buf, g
s_endpoint,
peer->rx_bytes,
peer->tx_bytes,
+ peer->persistent_keepalive_interval > 0
+ ? nm_sprintf_buf (s_keepalive, " keepalive %u", (guint) peer->persistent_keepalive_interval)
+ : "",
peer->allowed_ips_len > 0
? " allowed-ips"
: "");