From c37695009f79502b3c9db99f700f34eac5968dcd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 14 Nov 2008 17:04:29 +0000 Subject: [PATCH] 2008-11-14 Dan Williams * 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) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4284 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 7 +++++++ vpn-daemons/vpnc/properties/nm-vpnc.c | 8 ++++---- vpn-daemons/vpnc/src/nm-vpnc-service.c | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index 65eb2088a3..c8df7b3aee 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,10 @@ +2008-11-14 Dan Williams + + * 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) + 2008-11-14 Dan Williams Add password types to better support OTP/token use-cases, and for people diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.c b/vpn-daemons/vpnc/properties/nm-vpnc.c index 22014a6a5d..bbeac8bcf8 100644 --- a/vpn-daemons/vpnc/properties/nm-vpnc.c +++ b/vpn-daemons/vpnc/properties/nm-vpnc.c @@ -447,16 +447,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, _("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; } diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c index 22169748c6..ba9d332533 100644 --- a/vpn-daemons/vpnc/src/nm-vpnc-service.c +++ b/vpn-daemons/vpnc/src/nm-vpnc-service.c @@ -403,12 +403,12 @@ nm_vpnc_config_write (gint vpnc_fd, 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));