Attachment 615396 Details for Bug 829010 – patch

[patch] patch

0001-Update-to-new-snapshot-to-get-IPv6-support-829010.patch (text/plain), 17.56 KB, created by Dan Winship on 2012-09-21 11:37:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2012-09-21 11:37:12 UTC

Size: 17.56 KB

patch

obsolete

>From 7f3723d5bd500c24cbed3553eaecc9dc82ea278c Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Tue, 18 Sep 2012 10:59:57 -0400
>Subject: [PATCH] Update to new snapshot to get IPv6 support (#829010)
>
>---
> .gitignore                      |   1 +
> NetworkManager-openconnect.spec |  22 +-
> build-against-nm-0.9.4.patch    | 452 ----------------------------------------
> sources                         |   2 +-
> 4 files changed, 11 insertions(+), 466 deletions(-)
> delete mode 100644 build-against-nm-0.9.4.patch
>
>diff --git a/.gitignore b/.gitignore
>index a0339f0..aa86e22 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -14,3 +14,4 @@ NetworkManager-openconnect-0.8.1.tar.bz2
> /NetworkManager-openconnect-0.9.3.997.tar.bz2
> /NetworkManager-openconnect-0.9.4.0.tar.xz
> /NetworkManager-openconnect-0.9.4.0.git20120612.tar.xz
>+/NetworkManager-openconnect-0.9.7.0.git20120918.tar.bz2
>diff --git a/NetworkManager-openconnect.spec b/NetworkManager-openconnect.spec
>index e33cc85..da3e00b 100644
>--- a/NetworkManager-openconnect.spec
>+++ b/NetworkManager-openconnect.spec
>@@ -1,21 +1,19 @@
>-%define nm_version          1:0.9.2
>+%define nm_version          1:0.9.6
> %define dbus_version        1.1
> %define gtk3_version        3.0.0
> %define openconnect_version 3.99
> 
>-%define snapshot .git20120612
>-%define realversion 0.9.4.0
>+%define snapshot .git20120918
>+%define realversion 0.9.7.0
> 
> Summary:   NetworkManager VPN integration for openconnect
> Name:      NetworkManager-openconnect
>-Version:   0.9.4.0
>-Release:   8%{snapshot}%{?dist}
>+Version:   0.9.7.0
>+Release:   1%{snapshot}%{?dist}
> License:   GPLv2+, LGPLv2.1
> Group:     System Environment/Base
> URL:       http://www.gnome.org/projects/NetworkManager/
>-Source:    ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/%{name}-%{realversion}%{snapshot}.tar.xz
>-# Revert the bit which only builds against NetworkManager HEAD:
>-Patch1: build-against-nm-0.9.4.patch
>+Source:    ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/%{name}-%{realversion}%{snapshot}.tar.bz2
> 
> BuildRequires: gtk3-devel             >= %{gtk3_version}
> BuildRequires: dbus-devel             >= %{dbus_version}
>@@ -23,11 +21,7 @@ BuildRequires: dbus-glib-devel        >= 0.74
> BuildRequires: NetworkManager-devel   >= %{nm_version}
> BuildRequires: NetworkManager-glib-devel >= %{nm_version}
> BuildRequires: GConf2-devel
>-%if 0%{?fedora} > 16
> BuildRequires: libgnome-keyring-devel
>-%else
>-BuildRequires: gnome-keyring-devel
>-%endif
> BuildRequires: intltool gettext
> BuildRequires: autoconf automake libtool
> BuildRequires: pkgconfig(libxml-2.0)
>@@ -46,7 +40,6 @@ with NetworkManager and the GNOME desktop
> 
> %prep
> %setup -q -n NetworkManager-openconnect-%{realversion}
>-%patch1 -p1
> 
> %build
> autoreconf
>@@ -97,6 +90,9 @@ fi
> %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
> 
> %changelog
>+* Tue Sep 18 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-1.git20120918
>+- Update to new snapshot to get IPv6 support (#829010)
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4.0-8.git20120612
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/build-against-nm-0.9.4.patch b/build-against-nm-0.9.4.patch
>deleted file mode 100644
>index 6b05470..0000000
>--- a/build-against-nm-0.9.4.patch
>+++ /dev/null
>@@ -1,452 +0,0 @@
>-Revert this because it doesn't build unless we have newer NetworkManager:
>-
>-commit 1aecd6000ed5baedc6c5a9d38933e3bf52e5bd06
>-Author: Dan Winship <danw@gnome.org>
>-Date:   Wed May 23 16:30:47 2012 -0400
>-
>-    service: pass IPv6-related information to NM as well
>-
>-(patch mangled to cope with other subsequent changes)
>-diff --git a/src/nm-openconnect-service-openconnect-helper.c b/src/nm-openconnect-service-openconnect-helper.c
>-index 8ac651f..2781cab 100644
>---- a/src/nm-openconnect-service-openconnect-helper.c
>-+++ b/src/nm-openconnect-service-openconnect-helper.c
>-@@ -34,7 +34,6 @@
>- #include <dbus/dbus-glib-lowlevel.h>
>- #include <dbus/dbus-glib.h>
>- #include <NetworkManager.h>
>--#include <nm-vpn-plugin-utils.h>
>- 
>- #include "nm-openconnect-service.h"
>- #include "nm-utils.h"
>-@@ -42,9 +41,6 @@
>- /* These are here because nm-dbus-glib-types.h isn't exported */
>- #define DBUS_TYPE_G_ARRAY_OF_UINT          (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
>- #define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_ARRAY_OF_UINT))
>--#define DBUS_TYPE_G_MAP_OF_VARIANT         (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
>--#define DBUS_TYPE_G_IP6_ROUTE              (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
>--#define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE     (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
>- 
>- static void
>- helper_failed (DBusGConnection *connection, const char *reason)
>-@@ -75,8 +71,7 @@ helper_failed (DBusGConnection *connection, const char *reason)
>- }
>- 
>- static void
>--send_config (DBusGConnection *connection, GHashTable *config,
>--             GHashTable *ip4config, GHashTable *ip6config)
>-+send_ip4_config (DBusGConnection *connection, GHashTable *config)
>- {
>- 	DBusGProxy *proxy;
>- 	GError *err = NULL;
>-@@ -86,34 +81,14 @@ send_config (DBusGConnection *connection, GHashTable *config,
>- 	                                   NM_VPN_DBUS_PLUGIN_PATH,
>- 	                                   NM_VPN_DBUS_PLUGIN_INTERFACE);
>- 
>--	if (!dbus_g_proxy_call (proxy, "SetConfig", &err,
>--	                        DBUS_TYPE_G_MAP_OF_VARIANT,
>--	                        config,
>--	                        G_TYPE_INVALID,
>--	                        G_TYPE_INVALID))
>--		goto done;
>--
>--	if (ip4config) {
>--		if (!dbus_g_proxy_call (proxy, "SetIp4Config", &err,
>--		                        DBUS_TYPE_G_MAP_OF_VARIANT,
>--		                        ip4config,
>--		                        G_TYPE_INVALID,
>--		                        G_TYPE_INVALID))
>--			goto done;
>--	}
>--
>--	if (ip6config) {
>--		if (!dbus_g_proxy_call (proxy, "SetIp6Config", &err,
>--		                        DBUS_TYPE_G_MAP_OF_VARIANT,
>--		                        ip6config,
>--		                        G_TYPE_INVALID,
>--		                        G_TYPE_INVALID))
>--			goto done;
>--	}
>-+	dbus_g_proxy_call (proxy, "SetIp4Config", &err,
>-+	                   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
>-+	                   config,
>-+	                   G_TYPE_INVALID,
>-+	                   G_TYPE_INVALID);
>- 
>-- done:
>- 	if (err) {
>--		g_warning ("Could not send configuration information: %s", err->message);
>-+		g_warning ("Could not send failure information: %s", err->message);
>- 		g_error_free (err);
>- 	}
>- 
>-@@ -172,7 +147,7 @@ bool_to_gvalue (gboolean b)
>- }
>- 
>- static GValue *
>--addr4_to_gvalue (const char *str)
>-+addr_to_gvalue (const char *str)
>- {
>- 	struct in_addr	temp_addr;
>- 
>-@@ -187,7 +162,7 @@ addr4_to_gvalue (const char *str)
>- }
>- 
>- static GValue *
>--addr4_list_to_gvalue (const char *str)
>-+addr_list_to_gvalue (const char *str)
>- {
>- 	GValue *val;
>- 	char **split;
>-@@ -247,50 +222,6 @@ addr6_to_gvalue (const char *str)
>- }
>- 
>- static GValue *
>--addr6_list_to_gvalue (const char *str)
>--{
>--	GValue *val;
>--	char **split;
>--	int i;
>--	GPtrArray *array;
>--	GByteArray *ba;
>--
>--	/* Empty */
>--	if (!str || strlen (str) < 1)
>--		return NULL;
>--
>--	split = g_strsplit (str, " ", -1);
>--	if (g_strv_length (split) == 0)
>--		return NULL;
>--
>--	array = g_ptr_array_new_full (g_strv_length (split),
>--	                              (GDestroyNotify) g_byte_array_unref);
>--	for (i = 0; split[i]; i++) {
>--		struct in6_addr addr;
>--
>--		if (inet_pton (AF_INET6, split[i], &addr) > 0) {
>--			ba = g_byte_array_new ();
>--			g_byte_array_append (ba, (guint8 *) &addr, sizeof (addr));
>--			g_ptr_array_add (array, ba);
>--		} else {
>--			g_strfreev (split);
>--			g_ptr_array_free (array, TRUE);
>--			return NULL;
>--		}
>--	}
>--
>--	g_strfreev (split);
>--
>--	val = g_slice_new0 (GValue);
>--	g_value_init (val, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT);
>--	g_value_set_boxed (val, array);
>--
>--	return val;
>--}
>--
>--#define BUFLEN 256
>--
>--static GValue *
>- split_dns_list_to_gvalue (const char *str)
>- {
>- 	GValue *val;
>-@@ -311,7 +242,7 @@ split_dns_list_to_gvalue (const char *str)
>- }
>- 
>- static GValue *
>--get_ip4_routes (void)
>-+get_routes (void)
>- {
>- 	GValue *value = NULL;
>- 	GPtrArray *routes;
>-@@ -319,6 +250,8 @@ get_ip4_routes (void)
>- 	int num;
>- 	int i;
>- 
>-+#define BUFLEN 256
>-+
>- 	tmp = getenv ("CISCO_SPLIT_INC");
>- 	if (!tmp || strlen (tmp) < 1)
>- 		return NULL;
>-@@ -385,77 +318,6 @@ get_ip4_routes (void)
>- 	return value;
>- }
>- 
>--static GValue *
>--get_ip6_routes (void)
>--{
>--	GValue *value = NULL;
>--	GSList *routes;
>--	char *tmp;
>--	int num;
>--	int i;
>--
>--	tmp = getenv ("CISCO_IPV6_SPLIT_INC");
>--	if (!tmp || strlen (tmp) < 1)
>--		return NULL;
>--
>--	num = atoi (tmp);
>--	if (!num)
>--		return NULL;
>--
>--	routes = NULL;
>--
>--	for (i = 0; i < num; i++) {
>--		NMIP6Route *route;
>--		char buf[BUFLEN];
>--		struct in6_addr network;
>--		guint32 prefix;
>--
>--		snprintf (buf, BUFLEN, "CISCO_IPV6_SPLIT_INC_%d_ADDR", i);
>--		tmp = getenv (buf);
>--		if (!tmp || inet_pton (AF_INET6, tmp, &network) <= 0) {
>--			g_warning ("Ignoring invalid static route address '%s'", tmp ? tmp : "NULL");
>--			continue;
>--		}
>--
>--		snprintf (buf, BUFLEN, "CISCO_IPV6_SPLIT_INC_%d_MASKLEN", i);
>--		tmp = getenv (buf);
>--		if (tmp) {
>--			long int tmp_prefix;
>--
>--			errno = 0;
>--			tmp_prefix = strtol (tmp, NULL, 10);
>--			if (errno || tmp_prefix <= 0 || tmp_prefix > 128) {
>--				g_warning ("Ignoring invalid static route prefix '%s'", tmp ? tmp : "NULL");
>--				continue;
>--			}
>--			prefix = (guint32) tmp_prefix;
>--		} else {
>--			g_warning ("Ignoring static route %d with no prefix length", i);
>--			continue;
>--		}
>--
>--		route = nm_ip6_route_new ();
>--		nm_ip6_route_set_dest (route, &network);
>--		nm_ip6_route_set_prefix (route, prefix);
>--
>--		routes = g_slist_append (routes, route);
>--	}
>--
>--	if (routes) {
>--		GSList *iter;
>--
>--		value = g_slice_new0 (GValue);
>--		g_value_init (value, DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE);
>--		nm_utils_ip6_routes_to_gvalue (routes, value);
>--
>--		for (iter = routes; iter; iter = iter->next)
>--			nm_ip6_route_unref (iter->data);
>--		g_slist_free (routes);
>--	}
>--
>--	return value;
>--}
>--
>- /*
>-  * Environment variables passed back from 'openconnect':
>-  *
>-@@ -474,7 +336,7 @@ main (int argc, char *argv[])
>- {
>- 	DBusGConnection *connection;
>- 	char *tmp;
>--	GHashTable *config, *ip4config, *ip6config;
>-+	GHashTable *config;
>- 	GValue *val;
>- 	GError *err = NULL;
>- 	struct in_addr temp_addr;
>-@@ -495,80 +357,63 @@ main (int argc, char *argv[])
>- 	}
>- 
>- 	config = g_hash_table_new (g_str_hash, g_str_equal);
>--	ip4config = g_hash_table_new (g_str_hash, g_str_equal);
>--	ip6config = g_hash_table_new (g_str_hash, g_str_equal);
>- 
>- 	/* Gateway */
>--	val = addr4_to_gvalue (getenv ("VPNGATEWAY"));
>-+	val = addr_to_gvalue (getenv ("VPNGATEWAY"));
>- 	if (!val)
>- 		val = addr6_to_gvalue (getenv ("VPNGATEWAY"));
>- 	if (val)
>--		g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
>- 	else
>- 		helper_failed (connection, "VPN Gateway");
>- 
>- 	/* Tunnel device */
>- 	val = str_to_gvalue (getenv ("TUNDEV"), FALSE);
>- 	if (val)
>--		g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_TUNDEV, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
>- 	else
>- 		helper_failed (connection, "Tunnel Device");
>- 
>--	/* Banner */
>--	val = str_to_gvalue (getenv ("CISCO_BANNER"), TRUE);
>--	if (val)
>--		g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_BANNER, val);
>--
>--	/* Default domain */
>--	val = str_to_gvalue (getenv ("CISCO_DEF_DOMAIN"), TRUE);
>--	if (val)
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val);
>--
>--	/* MTU  */
>--	tmp = getenv ("INTERNAL_IP4_MTU");
>--	if (tmp && strlen (tmp)) {
>--		long int mtu;
>--
>--		errno = 0;
>--		mtu = strtol (tmp, NULL, 10);
>--		if (errno || mtu < 0 || mtu > 20000) {
>--			g_warning ("Ignoring invalid tunnel MTU '%s'", tmp);
>--		} else {
>--			val = uint_to_gvalue ((guint32) mtu);
>--			g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_MTU, val);
>--		}
>--	}
>--
>--	/* IPv4 address */
>--	val = addr4_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS"));
>-+	/* IP address */
>-+	val = addr_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS"));
>- 	if (val)
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val);
>- 	else
>- 		helper_failed (connection, "IP4 Address");
>- 
>--	/* IPv4 PTP address; for openconnect PTP address == internal IPv4 address */
>--	val = addr4_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS"));
>-+	/* PTP address; for openconnect PTP address == internal IP4 address */
>-+	val = addr_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS"));
>- 	if (val)
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val);
>- 	else
>- 		helper_failed (connection, "IP4 PTP Address");
>- 
>--	/* IPv4 Netmask */
>-+	/* Netmask */
>- 	tmp = getenv ("INTERNAL_IP4_NETMASK");
>- 	if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
>--		val = uint_to_gvalue (nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
>-+		GValue *value;
>-+
>-+		value = g_slice_new0 (GValue);
>-+		g_value_init (value, G_TYPE_UINT);
>-+		g_value_set_uint (value, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
>-+
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, value);
>- 	}
>- 
>- 	/* DNS */
>--	val = addr4_list_to_gvalue (getenv ("INTERNAL_IP4_DNS"));
>-+	val = addr_list_to_gvalue (getenv ("INTERNAL_IP4_DNS"));
>- 	if (val)
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_DNS, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DNS, val);
>- 
>- 	/* WINS servers */
>--	val = addr4_list_to_gvalue (getenv ("INTERNAL_IP4_NBNS"));
>-+	val = addr_list_to_gvalue (getenv ("INTERNAL_IP4_NBNS"));
>- 	if (val)
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_NBNS, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_NBNS, val);
>-+
>-+	/* Default domain */
>-+	val = str_to_gvalue (getenv ("CISCO_DEF_DOMAIN"), TRUE);
>-+	if (val)
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val);
>- 
>- 	/* Split DNS domains */
>- 	val = split_dns_list_to_gvalue (getenv ("CISCO_SPLIT_DNS"));
>-@@ -576,69 +421,35 @@ main (int argc, char *argv[])
>- 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, val);
>- 
>- 	/* Routes */
>--	val = get_ip4_routes ();
>-+	val = get_routes ();
>- 	if (val) {
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, val);
>- 		/* If routes-to-include were provided, that means no default route */
>--		g_hash_table_insert (ip4config, NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT,
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT,
>- 		                     bool_to_gvalue (TRUE));
>- 	}
>--
>--	/* IPv6 address */
>--	val = addr6_to_gvalue (getenv ("INTERNAL_IP6_ADDRESS"));
>--	if (val)
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, val);
>--	else
>--		helper_failed (connection, "IP6 Address");
>--
>--	/* IPv6 PTP address; for openconnect PTP address == internal IPv6 address */
>--	val = addr6_to_gvalue (getenv ("INTERNAL_IP6_ADDRESS"));
>--	if (val)
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_PTP, val);
>--	else
>--		helper_failed (connection, "IP6 PTP Address");
>--
>--	/* IPv6 Netmask */
>--	tmp = getenv ("INTERNAL_IP6_NETMASK");
>--	if (tmp)
>--		tmp = strchr (tmp, '/');
>--	if (tmp) {
>--		val = uint_to_gvalue (strtol (tmp + 1, NULL, 10));
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, val);
>--	}
>--
>--	/* DNS */
>--	val = addr6_list_to_gvalue (getenv ("INTERNAL_IP6_DNS"));
>-+	/* Banner */
>-+	val = str_to_gvalue (getenv ("CISCO_BANNER"), TRUE);
>- 	if (val)
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_DNS, val);
>-+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_BANNER, val);
>- 
>--	/* Routes */
>--	val = get_ip6_routes ();
>--	if (val) {
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, val);
>--		/* If routes-to-include were provided, that means no default route */
>--		g_hash_table_insert (ip6config, NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT,
>--		                     bool_to_gvalue (TRUE));
>--	}
>--
>--	if (g_hash_table_size (ip4config)) {
>--		g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4,
>--							 bool_to_gvalue (TRUE));
>--	} else {
>--		g_hash_table_destroy (ip4config);
>--		ip4config = NULL;
>--	}
>-+	/* MTU  */
>-+	tmp = getenv ("INTERNAL_IP4_MTU");
>-+	if (tmp && strlen (tmp)) {
>-+		long int mtu;
>- 
>--	if (g_hash_table_size (ip6config)) {
>--		g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6,
>--							 bool_to_gvalue (TRUE));
>--	} else {
>--		g_hash_table_destroy (ip6config);
>--		ip6config = NULL;
>-+		errno = 0;
>-+		mtu = strtol (tmp, NULL, 10);
>-+		if (errno || mtu < 0 || mtu > 20000) {
>-+			g_warning ("Ignoring invalid tunnel MTU '%s'", tmp);
>-+		} else {
>-+			val = uint_to_gvalue ((guint32) mtu);
>-+			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_MTU, val);
>-+		}
>- 	}
>- 
>- 	/* Send the config info to nm-openconnect-service */
>--	send_config (connection, config, ip4config, ip6config);
>-+	send_ip4_config (connection, config);
>- 
>- 	exit (0);
>- }
>diff --git a/sources b/sources
>index b3db0fd..878f895 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-8041a269a51f1cad661017c5afcc5d7a  NetworkManager-openconnect-0.9.4.0.git20120612.tar.xz
>+25c33e25e21b5810c9b2ffba2d4fa059  NetworkManager-openconnect-0.9.7.0.git20120918.tar.bz2
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 829010: 615396