fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-12-31 Christopher Aillon <caillon@redhat.com>

Browse source 
* src/nm-vpnc-service.h:
	* src/nm-vpnc-service.c:
		- Support Cisco UDP Encapsulation in vpnc >= 0.4 (#420925)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3200 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Christopher Aillon 2007-12-31 15:30:02 +00:00 • committed by Chris Aillon
parent e1c6ace217
commit 60cebd2de6
3 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vpn-daemons/vpnc/ChangeLog
View file

@ -1,3 +1,9 @@
2007-12-31 Christopher Aillon <caillon@redhat.com>
* src/nm-vpnc-service.h:
* src/nm-vpnc-service.c:
- Support Cisco UDP Encapsulation in vpnc >= 0.4 (#420925)
2007-12-11 Dan Williams <dcbw@redhat.com> 2007-12-11 Dan Williams <dcbw@redhat.com>
Patches from Casey Harkins <caseyharkins@gmail.com> Patches from Casey Harkins <caseyharkins@gmail.com>

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

@ -40,22 +40,27 @@ typedef struct {
} ValidProperty; } ValidProperty;
static ValidProperty valid_properties[] = { static ValidProperty valid_properties[] = {
{ NM_VPNC_KEY_GATEWAY, G_TYPE_STRING }, { NM_VPNC_KEY_GATEWAY, G_TYPE_STRING },
{ NM_VPNC_KEY_ID, G_TYPE_STRING }, { NM_VPNC_KEY_ID, G_TYPE_STRING },
{ NM_VPNC_KEY_SECRET, G_TYPE_STRING }, { NM_VPNC_KEY_SECRET, G_TYPE_STRING },
{ NM_VPNC_KEY_XAUTH_USER, G_TYPE_STRING }, { NM_VPNC_KEY_XAUTH_USER, G_TYPE_STRING },
{ NM_VPNC_KEY_XAUTH_PASSWORD, G_TYPE_STRING }, { NM_VPNC_KEY_XAUTH_PASSWORD, G_TYPE_STRING },
{ NM_VPNC_KEY_UDP_ENCAPS, G_TYPE_BOOLEAN }, { NM_VPNC_KEY_DOMAIN, G_TYPE_STRING },
{ NM_VPNC_KEY_UDP_ENCAPS_PORT, G_TYPE_INT }, { NM_VPNC_KEY_DHGROUP, G_TYPE_STRING },
{ NM_VPNC_KEY_DOMAIN, G_TYPE_STRING }, { NM_VPNC_KEY_PERFECT_FORWARD, G_TYPE_STRING },
{ NM_VPNC_KEY_DHGROUP, G_TYPE_STRING }, { NM_VPNC_KEY_APP_VERSION, G_TYPE_STRING },
{ NM_VPNC_KEY_PERFECT_FORWARD, G_TYPE_STRING }, { NM_VPNC_KEY_REKEYING, G_TYPE_INT },
{ NM_VPNC_KEY_APP_VERSION, G_TYPE_STRING }, { NM_VPNC_KEY_NAT_KEEPALIVE, G_TYPE_STRING },
{ NM_VPNC_KEY_REKEYING, G_TYPE_INT }, { NM_VPNC_KEY_DISABLE_NAT, G_TYPE_BOOLEAN },
{ NM_VPNC_KEY_NAT_KEEPALIVE, G_TYPE_STRING }, { NM_VPNC_KEY_SINGLE_DES, G_TYPE_BOOLEAN },
{ NM_VPNC_KEY_DISABLE_NAT, G_TYPE_BOOLEAN }, /* vpnc 0.3.x */
{ NM_VPNC_KEY_SINGLE_DES, G_TYPE_BOOLEAN }, { NM_VPNC_KEY_UDP_ENCAPS, G_TYPE_BOOLEAN },
{ NULL, G_TYPE_NONE } { NM_VPNC_KEY_UDP_ENCAPS_PORT, G_TYPE_INT },
/* vpnc 0.4.x */
{ NM_VPNC_KEY_NAT_TRAVERSAL_MODE, G_TYPE_STRING },
{ NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT, G_TYPE_INT },
{ NULL, G_TYPE_NONE }
}; };
static void static void
@ -246,7 +251,14 @@ nm_vpnc_config_write (gint vpnc_fd,
NM_VPNC_REKEYING_INTERVAL); NM_VPNC_REKEYING_INTERVAL);
} }
// FIXME: do we need to enable Cisco UDP encapsulation here? /* Options for vpnc 0.4.x */
write_config_option (vpnc_fd,
NM_VPNC_KEY_NAT_TRAVERSAL_MODE " %s\n",
"cisco-udp");
write_config_option (vpnc_fd,
NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT " %d\n",
NM_VPNC_UDP_ENCAPSULATION_PORT);
/* 0.4.x rekeys automatically */ /* 0.4.x rekeys automatically */
/* Fill username if it's not present */ /* Fill username if it's not present */

9
vpn-daemons/vpnc/src/nm-vpnc-service.h
View file

@ -23,8 +23,6 @@
#define NM_VPNC_KEY_SECRET "IPSec secret" #define NM_VPNC_KEY_SECRET "IPSec secret"
#define NM_VPNC_KEY_XAUTH_USER "Xauth username" #define NM_VPNC_KEY_XAUTH_USER "Xauth username"
#define NM_VPNC_KEY_XAUTH_PASSWORD "Xauth password" #define NM_VPNC_KEY_XAUTH_PASSWORD "Xauth password"
#define NM_VPNC_KEY_UDP_ENCAPS "UDP Encapsulate"
#define NM_VPNC_KEY_UDP_ENCAPS_PORT "UDP Encapsulation Port"
#define NM_VPNC_KEY_DOMAIN "Domain" #define NM_VPNC_KEY_DOMAIN "Domain"
#define NM_VPNC_KEY_DHGROUP "IKE DH Group" #define NM_VPNC_KEY_DHGROUP "IKE DH Group"
#define NM_VPNC_KEY_PERFECT_FORWARD "Perfect Forward Secrecy" #define NM_VPNC_KEY_PERFECT_FORWARD "Perfect Forward Secrecy"
@ -33,7 +31,12 @@
#define NM_VPNC_KEY_NAT_KEEPALIVE "NAT-Keepalive packet interval" #define NM_VPNC_KEY_NAT_KEEPALIVE "NAT-Keepalive packet interval"
#define NM_VPNC_KEY_DISABLE_NAT "Disable NAT Traversal" #define NM_VPNC_KEY_DISABLE_NAT "Disable NAT Traversal"
#define NM_VPNC_KEY_SINGLE_DES "Enable Single DES" #define NM_VPNC_KEY_SINGLE_DES "Enable Single DES"
/* vpnc 0.3.x */
#define NM_VPNC_KEY_UDP_ENCAPS "UDP Encapsulate"
#define NM_VPNC_KEY_UDP_ENCAPS_PORT "UDP Encapsulation Port"
/* vpnc 0.4.x */
#define NM_VPNC_KEY_NAT_TRAVERSAL_MODE "NAT Traversal Mode"
#define NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT "Cisco UDP Encapsulation Port"
typedef struct { typedef struct {
NMVPNPlugin parent; NMVPNPlugin parent;