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

vpn: cleanup loop in nm_vpn_connection_ip6_config_get()

Browse source 
I find it simpler to follow the pattern of checking conditions and
"erroring out", by going to the next entry. The entire loop already
behaves like that.

(cherry picked from commit f89b841b37)
This commit is contained in:
Thomas Haller 2020-04-27 20:29:13 +02:00
parent c7586e6388
commit 61e65e42dc
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1595,13 +1595,18 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
route.plen = plen;
route.network = nm_utils_ip4_address_clear_host_address (route.network, plen);
/* 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 (!(priv->ip4_external_gw && route.network == priv->ip4_external_gw && route.plen == 32))
nm_ip4_config_add_route (config, &route, NULL);
if ( priv->ip4_external_gw
&& route.network == priv->ip4_external_gw
&& route.plen == 32) {
/* 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.
*/
break;
}
nm_ip4_config_add_route (config, &route, NULL);
break;
default:
break;
@ -1792,13 +1797,18 @@ nm_vpn_connection_ip6_config_get (NMVpnConnection *self, GVariant *dict)
nm_utils_ip6_address_clear_host_address (&route.network, &route.network, route.plen);
/* Ignore host routes to the VPN gateway since NM adds one itself.
* 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 (!(priv->ip6_external_gw && IN6_ARE_ADDR_EQUAL (&route.network, priv->ip6_external_gw) && route.plen == 128))
nm_ip6_config_add_route (config, &route, NULL);
if ( priv->ip6_external_gw
&& IN6_ARE_ADDR_EQUAL (&route.network, priv->ip6_external_gw)
&& route.plen == 128) {
/* Ignore host routes to the VPN gateway since NM adds one itself.
* 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.
*/
goto next;
}
nm_ip6_config_add_route (config, &route, NULL);
next:
g_variant_unref (dest);