fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 00:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn: ignore VPN-provided gateway host route (bgo #583323)

Browse source 
Since NM adds the gateway host route in the manner that's correct
for the current routing situation, we don't really want random
gateway host routes from the VPN server getting added instead.
This commit is contained in:
Dan Williams 2009-08-28 10:35:38 -05:00
parent 79489be3b5
commit eb96ffda5d
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vpn-manager/nm-vpn-connection.c
View file

@ -396,6 +396,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
NMIP4Config *config;
GValue *val;
int i;
guint32 vpn_ext_gw = 0;
nm_info ("VPN connection '%s' (IP Config Get) reply received.",
nm_vpn_connection_get_name (connection));
@ -423,8 +424,10 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
/* External world-visible address of the VPN server */
val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY);
if (val)
if (val) {
nm_ip4_address_set_gateway (addr, g_value_get_uint (val));
vpn_ext_gw = g_value_get_uint (val);
}
val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS);
if (val)
@ -487,8 +490,22 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
GSList *iter;
routes = nm_utils_ip4_routes_from_gvalue (val);
for (iter = routes; iter; iter = iter->next)
nm_ip4_config_take_route (config, (NMIP4Route *) iter->data);
for (iter = routes; iter; iter = iter->next) {
NMIP4Route *route = iter->data;
/* Ignore host routes to the VPN gateway since NM adds one itself
* below. Since NM knows more about the routing situation than
* the VPN server, we want to use the NM created route instead of
* whatever the server provides.
*/
if ( vpn_ext_gw
&& nm_ip4_route_get_dest (route) == vpn_ext_gw
&& nm_ip4_route_get_prefix (route) == 32)
continue;
/* Otherwise accept the VPN-provided route */
nm_ip4_config_take_route (config, route);
}
g_slist_free (routes);
}