summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-08-22 17:50:31 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-08-23 17:15:38 +0200
commitbd3472fb824f8a20ebf28dd8e85b9f9c7070e082 (patch)
treed64ac736bc83ee38598bec6880cb080b5f8e055e
parent5f2c39fa29cb8d8fe30b413f4d051fb3d967d6b5 (diff)
downloadNetworkManager-bd3472fb824f8a20ebf28dd8e85b9f9c7070e082.tar.gz
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.
-rw-r--r--libnm/nm-vpn-service-plugin.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index e9232e702c..29c666c796 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