NetworkManager r4170 - in trunk/vpn-daemons/openvpn: . src

[dcbw svn gnome org]

Author: dcbw
Date: Sat Oct 11 14:44:45 2008
New Revision: 4170
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4170&view=rev

Log:
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)



Modified:
   trunk/vpn-daemons/openvpn/ChangeLog
   trunk/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c

Modified: trunk/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
==============================================================================
--- trunk/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c	(original)
+++ trunk/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c	Sat Oct 11 14:44:45 2008
@@ -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
  * a connection, uses DBUS to send information back to nm-openvpn-service
  *
@@ -298,13 +298,18 @@
 
 	config = g_hash_table_new (g_str_hash, g_str_equal);
 
-	/* Gateway */
+	/* External world-visible VPN gateway */
 	val = addr_to_gvalue (getenv ("trusted_ip"));
 	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
 		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 */
 	val = str_to_gvalue (getenv ("dev"), FALSE);
 	if (val)