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

vpn-connections: allow the plugin to specify route preferred src

Browse Source 
Tunnelled VPNs can need that so that correct source address is used for tunnel
routes.
This commit is contained in:
Lubomir Rintel
2015-10-29 09:12:52 +01:00
parent 698f54456f
commit 3b145a33b7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vpn-manager/nm-vpn-connection.c
View File

@@ -1451,10 +1451,13 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
if (g_variant_lookup (dict, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, "aau", &iter)) { if (g_variant_lookup (dict, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, "aau", &iter)) {
while (g_variant_iter_next (iter, "@au", &v)) { while (g_variant_iter_next (iter, "@au", &v)) {
NMPlatformIP4Route route; NMPlatformIP4Route route = { 0, };
if (g_variant_n_children (v) == 4) { switch (g_variant_n_children (v)) {
memset (&route, 0, sizeof (route)); case 5:
g_variant_get_child (v, 4, "u", &route.pref_src);
/* fallthrough */
case 4:
g_variant_get_child (v, 0, "u", &route.network); g_variant_get_child (v, 0, "u", &route.network);
g_variant_get_child (v, 1, "u", &route.plen); g_variant_get_child (v, 1, "u", &route.plen);
g_variant_get_child (v, 2, "u", &route.gateway); g_variant_get_child (v, 2, "u", &route.gateway);
@@ -1469,6 +1472,8 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
*/ */
if (!(priv->ip4_external_gw && route.network == priv->ip4_external_gw && route.plen == 32)) if (!(priv->ip4_external_gw && route.network == priv->ip4_external_gw && route.plen == 32))
nm_ip4_config_add_route (config, &route); nm_ip4_config_add_route (config, &route);
default:
_LOGW ("VPN connection: received invalid IPv4 route");
} }
g_variant_unref (v); g_variant_unref (v);
} }