Attachment 948196 Details for Bug 1153315 – Keep track of the IPsec connections state

[patch] Keep track of the IPsec connections state

nm-l2tp-track-state (text/plain), 1.61 KB, created by Alan Stern on 2014-10-18 22:19:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Stern

Created: 2014-10-18 22:19:24 UTC

Size: 1.61 KB

patch

obsolete

>The nm-l2tp-service program doesn't keep proper track of the state of
>the IPsec connection.  Although a flag is tested to see whether the
>connection is up, this flag is never set or cleared.  As a result, the
>connection information doesn't get deleted from the ipsec daemon's
>memory after it is taken down, and the daemon keeps trying to
>re-establish it.
>
>This patch sets and clears the priv->ipsec_up flag at the appropriate
>times.
>
> src/nm-l2tp-service.c |    5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>Index: NetworkManager-l2tp-0.9.8.7/src/nm-l2tp-service.c
>===================================================================
>--- NetworkManager-l2tp-0.9.8.7.orig/src/nm-l2tp-service.c
>+++ NetworkManager-l2tp-0.9.8.7/src/nm-l2tp-service.c
>@@ -636,6 +636,7 @@ l2tpd_watch_cb (GPid pid, gint status, g
> 
> 	if(priv->ipsec_up) {
> 		nm_l2tp_stop_ipsec();
>+		priv->ipsec_up = FALSE;
> 	}
> 
> 	/* Cleaning up config files */
>@@ -880,7 +881,7 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin
>                             NMSettingVPN *s_vpn,
>                             GError **error)
> {
>-	// NML2tpPluginPrivate *priv = NM_L2TP_PLUGIN_GET_PRIVATE (plugin);
>+	NML2tpPluginPrivate *priv = NM_L2TP_PLUGIN_GET_PRIVATE (plugin);
> 	const char *ipsec_binary;
> 	const char *value;
> 	char tmp_secrets[128];
>@@ -980,6 +981,7 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin
> 		return FALSE;
> 	}
> 
>+	priv->ipsec_up = TRUE;
> 	g_message(_("ipsec ready for action"));
> 	return TRUE;
> }
>@@ -1539,6 +1541,7 @@ real_disconnect (NMVPNPlugin   *plugin,
> 
> 	if(priv->ipsec_up) {
> 		nm_l2tp_stop_ipsec();
>+		priv->ipsec_up = FALSE;
> 	}
> 
> 	if (priv->connection) {

Actions: View | Diff

Attachments on bug 1153315: 947288 | 947289 | 948191 | 948193 | 948194 | 948195 | 948196 | 948197