From bd3472fb824f8a20ebf28dd8e85b9f9c7070e082 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 22 Aug 2018 17:50:31 +0200 Subject: [PATCH] vpn-service-plugin: cancel the connect timer on has_ipv4=has_ipv6=false NetworkManager considers a connection w/o L3 configuration fine and connected. Don't make VPN plugins commit suicide in such case. --- libnm/nm-vpn-service-plugin.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index e9232e702..29c666c79 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -385,6 +385,10 @@ nm_vpn_service_plugin_set_config (NMVpnServicePlugin *plugin, g_signal_emit (plugin, signals[CONFIG], 0, config); if (priv->dbus_vpn_service_plugin) nmdbus_vpn_plugin_emit_config (priv->dbus_vpn_service_plugin, config); + + if ( priv->has_ip4 == priv->got_ip4 + && priv->has_ip6 == priv->got_ip6) + nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STARTED); } void