From 6bfade3227752f6565a3812238dee415b077b967 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 8 Dec 2008 15:24:38 +0000 Subject: [PATCH] 2008-12-08 Dan Williams * src/vpn-manager/nm-vpn-connection.c - (plugin_state_changed): clear secrets before setting the connection state to FAILED, since doing so may destroy the connection itself, since the NMVPNService owning this NMVPNConnection will unref it when the NMVPNConnection is failed or stopped git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/NETWORKMANAGER_0_7@4374 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 +++++ src/vpn-manager/nm-vpn-connection.c | 51 ++++++++++++++--------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d4aa5dac6..57869c09af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-08 Dan Williams + + * src/vpn-manager/nm-vpn-connection.c + - (plugin_state_changed): clear secrets before setting the connection + state to FAILED, since doing so may destroy the connection itself, + since the NMVPNService owning this NMVPNConnection will unref it + when the NMVPNConnection is failed or stopped + 2008-12-05 Dan Williams Patch from Michael Biebl diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 6f3e2592e5..693ef44db6 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -280,39 +280,38 @@ plugin_failed (DBusGProxy *proxy, static void plugin_state_changed (DBusGProxy *proxy, - NMVPNServiceState state, - gpointer user_data) + NMVPNServiceState state, + gpointer user_data) { NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); nm_info ("VPN plugin state changed: %d", state); - if (state != NM_VPN_SERVICE_STATE_STOPPED) - return; + if (state == NM_VPN_SERVICE_STATE_STOPPED) { + /* Clear connection secrets to ensure secrets get requested each time the + * connection is activated. + */ + nm_connection_clear_secrets (priv->connection); - switch (nm_vpn_connection_get_vpn_state (connection)) { - case NM_VPN_CONNECTION_STATE_PREPARE: - case NM_VPN_CONNECTION_STATE_NEED_AUTH: - case NM_VPN_CONNECTION_STATE_CONNECT: - case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: - case NM_VPN_CONNECTION_STATE_ACTIVATED: - nm_info ("VPN plugin state change reason: %d", priv->failure_reason); - nm_vpn_connection_set_vpn_state (connection, - NM_VPN_CONNECTION_STATE_FAILED, - priv->failure_reason); + switch (nm_vpn_connection_get_vpn_state (connection)) { + case NM_VPN_CONNECTION_STATE_PREPARE: + case NM_VPN_CONNECTION_STATE_NEED_AUTH: + case NM_VPN_CONNECTION_STATE_CONNECT: + case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: + case NM_VPN_CONNECTION_STATE_ACTIVATED: + nm_info ("VPN plugin state change reason: %d", priv->failure_reason); + nm_vpn_connection_set_vpn_state (connection, + NM_VPN_CONNECTION_STATE_FAILED, + priv->failure_reason); - /* Reset the failure reason */ - priv->failure_reason = NM_VPN_CONNECTION_STATE_REASON_UNKNOWN; - break; - default: - break; + /* Reset the failure reason */ + priv->failure_reason = NM_VPN_CONNECTION_STATE_REASON_UNKNOWN; + break; + default: + break; + } } - - /* Clear connection secrets too so the auth dialogs get asked - * for them next time. - */ - nm_connection_clear_secrets (priv->connection); } static const char * @@ -631,8 +630,8 @@ nm_vpn_connection_activate (NMVPNConnection *connection) /* StateChanged signal */ dbus_g_proxy_add_signal (priv->proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); dbus_g_proxy_connect_signal (priv->proxy, "StateChanged", - G_CALLBACK (plugin_state_changed), - connection, NULL); + G_CALLBACK (plugin_state_changed), + connection, NULL); nm_vpn_connection_set_vpn_state (connection, NM_VPN_CONNECTION_STATE_NEED_AUTH,