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

vpn: avoid adding unneeded routes when ipvx.ignore-auto-routes=yes

Browse source 
Instead of adding routes and then let nm_ipx_config_merge_setting()
remove them, don't add them in the first place when
ipvx.ignore-auto-routes=yes.

(cherry picked from commit 8f677a7772)
This commit is contained in:
Beniamino Galvani 2017-11-17 11:28:54 +01:00
parent 1770e9339b
commit c7accc92d5
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vpn/nm-vpn-connection.c
View file

@ -1563,9 +1563,12 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
route_table = get_route_table (self, AF_INET, TRUE);
route_metric = nm_vpn_connection_get_ip4_route_metric (self);
s_ip = nm_connection_get_setting_ip4_config (_get_applied_connection (self));
if ( g_variant_lookup (dict, NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, "b", &b)
&& b) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip)) {
/* ignore VPN routes */
} else if ( g_variant_lookup (dict, NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, "b", &b)
&& b) {
if (priv->ip4_config) {
NMDedupMultiIter ipconf_iter;
const NMPlatformIP4Route *route;
@ -1616,7 +1619,6 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
never_default = b;
/* Merge in user overrides from the NMConnection's IPv4 setting */
s_ip = nm_connection_get_setting_ip4_config (_get_applied_connection (self));
nm_ip4_config_merge_setting (config,
s_ip,
route_table,
@ -1756,9 +1758,12 @@ nm_vpn_connection_ip6_config_get (NMVpnConnection *self, GVariant *dict)
route_table = get_route_table (self, AF_INET6, TRUE);
route_metric = nm_vpn_connection_get_ip6_route_metric (self);
s_ip = nm_connection_get_setting_ip6_config (_get_applied_connection (self));
if ( g_variant_lookup (dict, NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, "b", &b)
&& b) {
if (nm_setting_ip_config_get_ignore_auto_routes (s_ip)) {
/* Ignore VPN routes */
} else if ( g_variant_lookup (dict, NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, "b", &b)
&& b) {
if (priv->ip6_config) {
NMDedupMultiIter ipconf_iter;
const NMPlatformIP6Route *route;
@ -1806,7 +1811,6 @@ next:
never_default = b;
/* Merge in user overrides from the NMConnection's IPv6 setting */
s_ip = nm_connection_get_setting_ip6_config (_get_applied_connection (self));
nm_ip6_config_merge_setting (config,
s_ip,
route_table,