network-manager-openconnect r3 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Dec 15 17:05:01 2008
New Revision: 3
URL: http://svn.gnome.org/viewvc/network-manager-openconnect?rev=3&view=rev

Log:
2008-12-15  Dan Williams  <dcbw redhat com>

	* src/nm-openconnect-service-openconnect-helper.c
		- (main): MTU entry in IP4 config hash is supposed to be a uint



Modified:
   trunk/ChangeLog
   trunk/src/nm-openconnect-service-openconnect-helper.c

Modified: trunk/src/nm-openconnect-service-openconnect-helper.c
==============================================================================
--- trunk/src/nm-openconnect-service-openconnect-helper.c	(original)
+++ trunk/src/nm-openconnect-service-openconnect-helper.c	Mon Dec 15 17:05:01 2008
@@ -369,9 +369,19 @@
 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_BANNER, val);
 
 	/* MTU  */
-	val = str_to_gvalue (getenv ("INTERNAL_IP4_MTU"), TRUE);
-	if (val)
-		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_MTU, val);
+	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) {
+			nm_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_ip4_config (connection, config);