system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 18:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-11-14 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2008-11-14 17:04:29 +00:00
parent a4d0b07484
commit c37695009f
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vpn-daemons/vpnc/ChangeLog
View file

@ -1,3 +1,10 @@
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)
2008-11-14 Dan Williams <dcbw@redhat.com>
Add password types to better support OTP/token use-cases, and for people

8
vpn-daemons/vpnc/properties/nm-vpnc.c
View file

@ -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;
}

4
vpn-daemons/vpnc/src/nm-vpnc-service.c
View file

@ -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));