Attachment 663112 Details for Bug 845599 – [PATCH] NM-openswan plugin patch indicating no tun is used

[patch] [PATCH] NM-openswan plugin patch indicating no tun is used

0001-helper-send-_none_-in-tundev-to-indicate-tun-device-.patch (text/plain), 1.56 KB, created by Jirka Klimes on 2012-12-13 18:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2012-12-13 18:26:59 UTC

Size: 1.56 KB

patch

obsolete

>From a42bb50197deba356a16dcd99a4d728ee25ec325 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Thu, 13 Dec 2012 18:57:50 +0100
>Subject: [PATCH] helper: send "_none_" in tundev to indicate tun device is
> not used (rh #845599)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> src/nm-openswan-service-helper.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
>diff --git a/src/nm-openswan-service-helper.c b/src/nm-openswan-service-helper.c
>index cbbe927..5335b50 100644
>--- a/src/nm-openswan-service-helper.c
>+++ b/src/nm-openswan-service-helper.c
>@@ -235,13 +235,17 @@ main (int argc, char *argv[])
> 	else
> 		helper_failed (connection, "Openswan Pluto Right Peer (VPN Gateway)");
> 
>-	/* Tunnel device */
>-	//val = str_to_gvalue (getenv ("TUNDEV"), FALSE);
>-	val = str_to_gvalue ("tun0", FALSE);
>-	if (val)
>-		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
>-	else
>-		helper_failed (connection, "Tunnel Device");
>+#ifndef NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE
>+#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE "_none_"
>+#endif
>+	/* 
>+	 * Tunnel device
>+	 * Indicate that openswan plugin doesn't use tun/tap device
>+	 */
>+	val = g_slice_new0 (GValue);
>+	g_value_init (val, G_TYPE_STRING);
>+	g_value_set_string (val, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE);
>+	g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
> 
> 	/* IP address */
> 	val = addr_to_gvalue (getenv ("PLUTO_MY_SOURCEIP"));
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 845599: 663111 | 663112