fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

route-manager: keep a reference of the platform instance

Browse source 
Soon we will subscribe to the platform instance for change signals.
If a singleton instance uses another singleton instance, it should
keep a reference to it, especially if it subscribes to a signal
(that will be disconnected on dispose()).

(cherry picked from commit b79ade8975)
This commit is contained in:
Thomas Haller 2015-06-23 15:11:38 +02:00
parent 976726f221
commit 74da44e3df
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/nm-route-manager.c
View file

@ -39,6 +39,8 @@ typedef struct {
} RouteEntries; } RouteEntries;
typedef struct { typedef struct {
NMPlatform *platform;
RouteEntries ip4_routes; RouteEntries ip4_routes;
RouteEntries ip6_routes; RouteEntries ip6_routes;
} NMRouteManagerPrivate; } NMRouteManagerPrivate;
@ -358,7 +360,7 @@ _vx_route_sync (const VTableIP *vtable, NMRouteManager *self, int ifindex, const
NMPlatformIPXRoute *cur_ipx_route; NMPlatformIPXRoute *cur_ipx_route;
ipx_routes = vtable->vt->is_ip4 ? &priv->ip4_routes : &priv->ip6_routes; ipx_routes = vtable->vt->is_ip4 ? &priv->ip4_routes : &priv->ip6_routes;
plat_routes = vtable->vt->route_get_all (NM_PLATFORM_GET, ifindex, NM_PLATFORM_GET_ROUTE_FLAGS_WITH_NON_DEFAULT); plat_routes = vtable->vt->route_get_all (priv->platform, ifindex, NM_PLATFORM_GET_ROUTE_FLAGS_WITH_NON_DEFAULT);
plat_routes_idx = _route_index_create (vtable, plat_routes); plat_routes_idx = _route_index_create (vtable, plat_routes);
known_routes_idx = _route_index_create (vtable, known_routes); known_routes_idx = _route_index_create (vtable, known_routes);
@ -494,7 +496,7 @@ _vx_route_sync (const VTableIP *vtable, NMRouteManager *self, int ifindex, const
/* if @cur_ipx_route is not equal to @plat_route, the route must be deleted. */ /* if @cur_ipx_route is not equal to @plat_route, the route must be deleted. */
if (!(cur_ipx_route && route_id_cmp_result == 0)) if (!(cur_ipx_route && route_id_cmp_result == 0))
vtable->vt->route_delete (NM_PLATFORM_GET, ifindex, cur_plat_route); vtable->vt->route_delete (priv->platform, ifindex, cur_plat_route);
cur_plat_route = _get_next_plat_route (plat_routes_idx, FALSE, &i_plat_routes); cur_plat_route = _get_next_plat_route (plat_routes_idx, FALSE, &i_plat_routes);
} }
@ -515,7 +517,7 @@ _vx_route_sync (const VTableIP *vtable, NMRouteManager *self, int ifindex, const
* device routes, on the second the others (gateway routes). */ * device routes, on the second the others (gateway routes). */
continue; continue;
} }
vtable->vt->route_add (NM_PLATFORM_GET, 0, rest_route); vtable->vt->route_add (priv->platform, 0, rest_route);
} }
} }
g_array_unref (to_restore_routes); g_array_unref (to_restore_routes);
@ -559,7 +561,7 @@ _vx_route_sync (const VTableIP *vtable, NMRouteManager *self, int ifindex, const
|| route_id_cmp_result != 0 || route_id_cmp_result != 0
|| !_route_equals_ignoring_ifindex (vtable, cur_plat_route, cur_ipx_route)) { || !_route_equals_ignoring_ifindex (vtable, cur_plat_route, cur_ipx_route)) {
if (!vtable->vt->route_add (NM_PLATFORM_GET, ifindex, cur_ipx_route)) { if (!vtable->vt->route_add (priv->platform, ifindex, cur_ipx_route)) {
if (cur_ipx_route->rx.source < NM_IP_CONFIG_SOURCE_USER) { if (cur_ipx_route->rx.source < NM_IP_CONFIG_SOURCE_USER) {
_LOGD (vtable->vt->addr_family, _LOGD (vtable->vt->addr_family,
"ignore error adding IPv%c route to kernel: %s", "ignore error adding IPv%c route to kernel: %s",
@ -646,12 +648,24 @@ nm_route_manager_init (NMRouteManager *self)
{ {
NMRouteManagerPrivate *priv = NM_ROUTE_MANAGER_GET_PRIVATE (self); NMRouteManagerPrivate *priv = NM_ROUTE_MANAGER_GET_PRIVATE (self);
priv->platform = g_object_ref (NM_PLATFORM_GET);
priv->ip4_routes.entries = g_array_new (FALSE, FALSE, sizeof (NMPlatformIP4Route)); priv->ip4_routes.entries = g_array_new (FALSE, FALSE, sizeof (NMPlatformIP4Route));
priv->ip6_routes.entries = g_array_new (FALSE, FALSE, sizeof (NMPlatformIP6Route)); priv->ip6_routes.entries = g_array_new (FALSE, FALSE, sizeof (NMPlatformIP6Route));
priv->ip4_routes.index = _route_index_create (&vtable_v4, priv->ip4_routes.entries); priv->ip4_routes.index = _route_index_create (&vtable_v4, priv->ip4_routes.entries);
priv->ip6_routes.index = _route_index_create (&vtable_v6, priv->ip6_routes.entries); priv->ip6_routes.index = _route_index_create (&vtable_v6, priv->ip6_routes.entries);
} }
static void
dispose (GObject *object)
{
NMRouteManagerPrivate *priv = NM_ROUTE_MANAGER_GET_PRIVATE (object);
g_clear_object (&priv->platform);
G_OBJECT_CLASS (nm_route_manager_parent_class)->dispose (object);
}
static void static void
finalize (GObject *object) finalize (GObject *object)
{ {
@ -673,5 +687,6 @@ nm_route_manager_class_init (NMRouteManagerClass *klass)
g_type_class_add_private (klass, sizeof (NMRouteManagerPrivate)); g_type_class_add_private (klass, sizeof (NMRouteManagerPrivate));
/* virtual methods */ /* virtual methods */
object_class->dispose = dispose;
object_class->finalize = finalize; object_class->finalize = finalize;
} }