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

vpn-connection: hold a route manager reference

Browse source 
NetworkManager:ERROR:nm-route-manager.c:77:nm_route_manager_get: assertion failed: (!_already_created || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE))
This commit is contained in:
Lubomir Rintel 2015-08-19 10:09:34 +02:00
parent 1b4e0f816e
commit a86447f498
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,6 +94,7 @@ typedef struct {
NMFirewallPendingCall fw_call;
NMDefaultRouteManager *default_route_manager;
NMRouteManager *route_manager;
GDBusProxy *proxy;
GCancellable *cancellable;
GVariant *connect_hash;
@ -238,7 +239,7 @@ vpn_cleanup (NMVpnConnection *connection, NMDevice *parent_dev)
if (priv->ip_ifindex) {
nm_platform_link_set_down (NM_PLATFORM_GET, priv->ip_ifindex);
nm_route_manager_route_flush (nm_route_manager_get (), priv->ip_ifindex);
nm_route_manager_route_flush (priv->route_manager, priv->ip_ifindex);
nm_platform_address_flush (NM_PLATFORM_GET, priv->ip_ifindex);
}
@ -2195,6 +2196,7 @@ nm_vpn_connection_init (NMVpnConnection *self)
priv->vpn_state = STATE_WAITING;
priv->secrets_idx = SECRETS_REQ_SYSTEM;
priv->default_route_manager = g_object_ref (nm_default_route_manager_get ());
priv->route_manager = g_object_ref (nm_route_manager_get ());
}
static void
@ -2237,6 +2239,7 @@ dispose (GObject *object)
g_clear_object (&priv->proxy);
g_clear_object (&priv->connection);
g_clear_object (&priv->default_route_manager);
g_clear_object (&priv->route_manager);
fw_call_cleanup (NM_VPN_CONNECTION (object));