From 1262be4ea827a6c324c498dfb22afb4d0f74cd99 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 15 Aug 2005 03:26:27 +0000 Subject: [PATCH] 2005-08-14 Christopher Aillon * src/nm-vpn-service.c: Use UDP Encapsulation, to allow multiple VPN connections from the same network git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@843 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 5 +++++ vpn-daemons/vpnc/src/nm-vpnc-service.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index 6e734a2261..6dfa3b415a 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,8 @@ +2005-08-14 Christopher Aillon + + * src/nm-vpn-service.c: Use UDP Encapsulation, to allow + multiple VPN connections from the same network + 2005-08-12 Robert Love * configure.in: add 'sv' translation diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c index 35c2a15469..b90d9cd4cc 100644 --- a/vpn-daemons/vpnc/src/nm-vpnc-service.c +++ b/vpn-daemons/vpnc/src/nm-vpnc-service.c @@ -55,6 +55,7 @@ static const char *vpnc_binary_paths[] = }; #define NM_VPNC_HELPER_PATH BINDIR"/nm-vpnc-service-vpnc-helper" +#define NM_VPNC_UDP_ENCAPSULATION_PORT 0 /* random port */ typedef struct NmVpncData { @@ -428,6 +429,14 @@ static gboolean nm_vpnc_config_write (guint vpnc_fd, const char *user_name, char x = write (vpnc_fd, string, strlen (string)); g_free (string); + string = g_strdup ("UDP Encapsulate\n"); + x = write (vpnc_fd, string, strlen (string)); + g_free (string); + + string = g_strdup_printf ("UDP Encapsulation Port %s\n", NM_VPNC_UDP_ENCAPSULATION_PORT); + x = write (vpnc_fd, string, strlen (string)); + g_free (string); + string = g_strdup_printf ("IPSec secret %s\n", password_items[0]); x = write (vpnc_fd, string, strlen (string)); g_free (string); @@ -483,6 +492,7 @@ static gboolean nm_vpnc_config_options_validate (char **data_items, int num_item { "IPSec secret", OPT_TYPE_ASCII }, { "Xauth username", OPT_TYPE_ASCII }, { "UDP Encapsulate", OPT_TYPE_NONE }, + { "UDP Encapsulation Port", OPT_TYPE_ASCII }, { "Domain", OPT_TYPE_ASCII }, { "IKE DH Group", OPT_TYPE_ASCII }, { "Perfect Forward Secrecy", OPT_TYPE_ASCII },