NetworkManager r4284 - in trunk/vpn-daemons/vpnc: . properties src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Nov 14 17:04:29 2008
New Revision: 4284
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4284&view=rev

Log:
2008-11-14  Dan Williams  <dcbw redhat com>

	* src/nm-vpnc-service.c
	  properties/nm-vpnc.c
		- Switch default NAT Traversal mode back to Cisco UDP until the plugin
			natively supports more vendors (bgo #512675)



Modified:
   trunk/vpn-daemons/vpnc/ChangeLog
   trunk/vpn-daemons/vpnc/properties/nm-vpnc.c
   trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c

Modified: trunk/vpn-daemons/vpnc/properties/nm-vpnc.c
==============================================================================
--- trunk/vpn-daemons/vpnc/properties/nm-vpnc.c	(original)
+++ trunk/vpn-daemons/vpnc/properties/nm-vpnc.c	Fri Nov 14 17:04:29 2008
@@ -447,16 +447,16 @@
 		natt_mode = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE);
 
 	gtk_list_store_append (store, &iter);
-	gtk_list_store_set (store, &iter, 0, _("NAT-T (default)"), 1, NM_VPNC_NATT_MODE_NATT, -1);
+	gtk_list_store_set (store, &iter, 0, _("Cisco UDP (default)"), 1, NM_VPNC_NATT_MODE_CISCO, -1);
 	if ((active < 0) && natt_mode) {
-		if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_NATT))
+		if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_CISCO))
 			active = 0;
 	}
 
 	gtk_list_store_append (store, &iter);
-	gtk_list_store_set (store, &iter, 0, _("Cisco UDP"), 1, NM_VPNC_NATT_MODE_CISCO, -1);
+	gtk_list_store_set (store, &iter, 0, _("NAT-T"), 1, NM_VPNC_NATT_MODE_NATT, -1);
 	if ((active < 0) && natt_mode) {
-		if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_CISCO))
+		if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_NATT))
 			active = 1;
 	}
 

Modified: trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c
==============================================================================
--- trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c	(original)
+++ trunk/vpn-daemons/vpnc/src/nm-vpnc-service.c	Fri Nov 14 17:04:29 2008
@@ -403,12 +403,12 @@
 		                     default_username);
 	}
 	
-	/* Use NAT-T by default */
+	/* Use Cisco UDP by default */
 	props_natt_mode = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE);
 	if (!props_natt_mode || !strlen (props_natt_mode)) {
 		write_config_option (vpnc_fd,
 		                     NM_VPNC_KEY_NAT_TRAVERSAL_MODE " %s\n",
-		                     NM_VPNC_NATT_MODE_NATT);
+		                     NM_VPNC_NATT_MODE_CISCO);
 	}
 
 	info = g_malloc0 (sizeof (WriteConfigInfo));