colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* src/nm-openvpn-service-openvpn-helper.c
		- (main): handle route_vpn_gateway (requires NM svn r4169) (bgo #549196)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4170 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-10-11 14:44:45 +00:00
parent 1c0a0ec4a8
commit 4b305ccfee
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vpn-daemons/openvpn/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-10-11 Dan Williams <dcbw@redhat.com>
* src/nm-openvpn-service-openvpn-helper.c
- (main): handle route_vpn_gateway (requires NM svn r4169) (bgo #549196)
2008-09-30 Dan Williams <dcbw@redhat.com> 2008-09-30 Dan Williams <dcbw@redhat.com>
* properties/nm-openvpn-dialog.glade * properties/nm-openvpn-dialog.glade

11
vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
View File

@@ -1,4 +1,4 @@
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* nm-openvpn-service-openvpn-helper - helper called after OpenVPN established /* nm-openvpn-service-openvpn-helper - helper called after OpenVPN established
* a connection, uses DBUS to send information back to nm-openvpn-service * a connection, uses DBUS to send information back to nm-openvpn-service
* *
@@ -298,13 +298,18 @@ main (int argc, char *argv[])
config = g_hash_table_new (g_str_hash, g_str_equal); config = g_hash_table_new (g_str_hash, g_str_equal);
/* Gateway */ /* External world-visible VPN gateway */
val = addr_to_gvalue (getenv ("trusted_ip")); val = addr_to_gvalue (getenv ("trusted_ip"));
if (val) if (val)
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val); g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val);
else else
helper_failed (connection, "VPN Gateway"); helper_failed (connection, "VPN Gateway");
/* Internal VPN subnet gateway */
val = addr_to_gvalue (getenv ("route_vpn_gateway"));
if (val)
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, val);
/* Tunnel device */ /* Tunnel device */
val = str_to_gvalue (getenv ("dev"), FALSE); val = str_to_gvalue (getenv ("dev"), FALSE);
if (val) if (val)