[network-manager-vpnc/NETWORKMANAGER_0_7] ui: default to NAT-T instead of Cisco-UDP



commit d77b488abf0c72439794c628751c8a495013d9e8
Author: Dan Williams <dcbw redhat com>
Date:   Wed Jan 13 12:26:13 2010 -0800

    ui: default to NAT-T instead of Cisco-UDP
    
    Cisco-UDP is an older NAT Traversal mode (on the 3000-series) that
    is propietary and has been deprecated for a long time.  NAT-T is
    the default mode in the newer concentrators (5000-series) and is
    a standard.  It's also supported by the 3000-series concentrators
    as well.  So default to NAT-T since that's what increasing numbers
    of installations are using out-of-the-box.

 properties/nm-vpnc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/properties/nm-vpnc.c b/properties/nm-vpnc.c
index 5050ad9..339c4a9 100644
--- a/properties/nm-vpnc.c
+++ b/properties/nm-vpnc.c
@@ -468,16 +468,16 @@ init_plugin_ui (VpncPluginUiWidget *self, NMConnection *connection, GError **err
 		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, _("Cisco UDP (default)"), 1, NM_VPNC_NATT_MODE_CISCO, -1);
+	gtk_list_store_set (store, &iter, 0, _("NAT-T (default)"), 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 = 0;
 	}
 
 	gtk_list_store_append (store, &iter);
-	gtk_list_store_set (store, &iter, 0, _("NAT-T"), 1, NM_VPNC_NATT_MODE_NATT, -1);
+	gtk_list_store_set (store, &iter, 0, _("Cisco UDP"), 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 = 1;
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]