fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-20 03:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn-connections: set ifname for tunelled VPN configuration

Browse source 
The configuration is going to be applied on the parent interface.

If we didn't do this, an attempt to add a route would result in an assertion
failure:

  nm-ip4-config.c:1475:nm_ip4_config_add_route: assertion failed: (priv->ifindex)
This commit is contained in:
Lubomir Rintel 2015-10-28 19:11:01 +01:00
parent 6e5fbf096a
commit 5c1c577c31
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1359,6 +1359,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
const char *str;
GVariant *v;
gboolean b;
int ifindex;
g_return_if_fail (dict && g_variant_is_of_type (dict, G_VARIANT_TYPE_VARDICT));
@ -1386,7 +1387,13 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
priv->has_ip6 = FALSE;
}
config = nm_ip4_config_new (priv->ip_ifindex);
if (priv->ip_ifindex > 0) {
ifindex = priv->ip_ifindex;
} else {
NMDevice *parent_dev = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (self));
ifindex = nm_device_get_ip_ifindex (parent_dev);
}
config = nm_ip4_config_new (ifindex);
memset (&address, 0, sizeof (address));
address.plen = 24;