network-manager-openvpn r60 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 23 22:44:40 2009
New Revision: 60
URL: http://svn.gnome.org/viewvc/network-manager-openvpn?rev=60&view=rev

Log:
2009-03-23  Dan Williams  <dcbw redhat com>

	Patch from Ove Everlid <Ove Everlid sun com>

	* src/nm-openvpn-service-openvpn-helper.c
		- (main): allow 'ifconfig_netmask' for TUN mode too



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

Modified: trunk/src/nm-openvpn-service-openvpn-helper.c
==============================================================================
--- trunk/src/nm-openvpn-service-openvpn-helper.c	(original)
+++ trunk/src/nm-openvpn-service-openvpn-helper.c	Mon Mar 23 22:44:40 2009
@@ -336,28 +336,24 @@
 
 	/* Netmask
 	 *
-	 * TAP devices pass back the netmask, while TUN devices always use /32
-	 * since they are point-to-point.
+	 * Either TAP or TUN modes can have an arbitrary netmask in newer versions
+	 * of openvpn, while in older versions only TAP mode would.  So accept a
+	 * netmask if passed, otherwise default to /32 for TUN devices since they
+	 * are usually point-to-point.
 	 */
-	if (tapdev) {
-		tmp = getenv ("ifconfig_netmask");
-		if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
-			GValue *val;
-
-			val = g_slice_new0 (GValue);
-			g_value_init (val, G_TYPE_UINT);
-			g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
-
-			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
-		}
-	} else {
-		GValue *val;
-
+	tmp = getenv ("ifconfig_netmask");
+	if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
+		val = g_slice_new0 (GValue);
+		g_value_init (val, G_TYPE_UINT);
+		g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
+		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
+	} else if (!tapdev) {
 		val = g_slice_new0 (GValue);
 		g_value_init (val, G_TYPE_UINT);
 		g_value_set_uint (val, 32);
 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
-	}
+	} else
+		nm_warning ("No IP4 netmask/prefix (missing or invalid 'ifconfig_netmask')");
 
 	val = get_routes ();
 	if (val)