Prefix the interger conversion to the correspond type size_t. Reported by Christian Hewitt. --- vpn/plugins/vpn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c index 96a06299be09..b1a64b18a1bb 100644 --- a/vpn/plugins/vpn.c +++ b/vpn/plugins/vpn.c @@ -523,7 +523,7 @@ static void vpn_task_setup(gpointer user_data) gid = get_gid(group); gid_list_size = get_supplementary_gids(suppl_groups, &gid_list); - DBG("vpn_task_setup uid:%d gid:%d supplementary group list size:%lu", + DBG("vpn_task_setup uid:%d gid:%d supplementary group list size:%zu", uid, gid, gid_list_size); -- 2.24.0

Add the optional PersistentKeepalive configuration option for the peer. Reported by Christian Hewitt. --- vpn/plugins/wireguard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vpn/plugins/wireguard.c b/vpn/plugins/wireguard.c index 4d2fe3c3ad75..34ce6b566263 100644 --- a/vpn/plugins/wireguard.c +++ b/vpn/plugins/wireguard.c @@ -293,6 +293,15 @@ static int wg_connect(struct vpn_provider *provider, if (err) goto done; + option = vpn_provider_get_string(provider, + "WireGuard.PersistentKeepalive"); + if (option) { + char *end; + info->peer.persistent_keepalive_interval = + g_ascii_strtoull(option, &end, 10); + info->peer.flags |= WGPEER_HAS_PERSISTENT_KEEPALIVE_INTERVAL; + } + option = vpn_provider_get_string(provider, "WireGuard.EndpointPort"); if (!option) option = "51820"; -- 2.24.0

244c2a69bf33 ("doc: Document WireGuard VPN plugin") missed to add WireGuard to the Type field. While at it, also streamline the number of empty lines between the sections. Reported by Christian Hewitt. --- doc/vpn-config-format.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/vpn-config-format.txt b/doc/vpn-config-format.txt index 3879a35ed078..34d4227702fc 100644 --- a/doc/vpn-config-format.txt +++ b/doc/vpn-config-format.txt @@ -32,7 +32,8 @@ Each provisioned provider must start with the [provider_*] tag. Replace * with an identifier unique to the config file. Allowed fields: -- Type: Provider type. Value of OpenConnect, OpenVPN, VPNC, L2TP or PPTP +- Type: Provider type. Value of OpenConnect, OpenVPN, VPNC, L2TP, PPTP or + WireGuard VPN related parameters (M = mandatory, O = optional): - Name: A user defined name for the VPN (M) @@ -253,7 +254,6 @@ L2TP VPN supports following options (see xl2tpd.conf(5) and pppd(8) for details) PPPD.ReqMPPEStateful mppe-stateful Allow MPPE to use stateful mode (O) PPPD.NoVJ novj No Van Jacobson compression (O) - PPTP VPN supports following options (see pptp(8) and pppd(8) for details) Option name pptp config value Description PPTP.User - PPTP user name, asked from the user @@ -278,7 +278,6 @@ PPTP VPN supports following options (see pptp(8) and pppd(8) for details) PPPD.RequirMPPEStateful mppe-stateful Allow MPPE to use stateful mode (O) PPPD.NoVJ novj No Van Jacobson compression (O) - WireGuard VPN supports following options Option name Description WireGuard.Address Internal IP address (local/netmask/peer) -- 2.24.0

Add the missing disconnect() call. In case where the D-Bus 'disconnect' method call is not used to shutdown the connection, we leak the connection. For example when the users edits the config file, we end up in the stop_vpn() function with an active WireGuard connection. Fixes 12f095a32eff ("vpn: Introduce VPN_FLAG_NO_DAEMON") Reported by Christian Hewitt --- vpn/plugins/vpn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c index b1a64b18a1bb..e4d04635654e 100644 --- a/vpn/plugins/vpn.c +++ b/vpn/plugins/vpn.c @@ -89,8 +89,10 @@ static int stop_vpn(struct vpn_provider *provider) vpn_driver_data = g_hash_table_lookup(driver_hash, name); if (vpn_driver_data && vpn_driver_data->vpn_driver && - vpn_driver_data->vpn_driver->flags & VPN_FLAG_NO_TUN) + vpn_driver_data->vpn_driver->flags & VPN_FLAG_NO_TUN) { + vpn_driver_data->vpn_driver->disconnect(data->provider); return 0; + } memset(&ifr, 0, sizeof(ifr)); ifr.ifr_flags = data->tun_flags | IFF_NO_PI; -- 2.24.0