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

default-route-manager: merge platform signal handler

Browse source 
(cherry picked from commit c4e6dd71a5)
This commit is contained in:
Thomas Haller 2015-06-24 15:54:44 +02:00
parent fc92787573
commit 39da025990
1 changed files with 28 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/nm-default-route-manager.c
View file

@ -1313,51 +1313,30 @@ _platform_ipx_route_changed_cb (const VTableIP *vtable,
} }
static void static void
_platform_ip4_address_changed_cb (NMPlatform *platform, _platform_changed_cb (NMPlatform *platform,
NMPObjectType obj_type, NMPObjectType obj_type,
int ifindex, int ifindex,
gpointer platform_object, gpointer platform_object,
NMPlatformSignalChangeType change_type, NMPlatformSignalChangeType change_type,
NMPlatformReason reason, NMPlatformReason reason,
NMDefaultRouteManager *self) NMDefaultRouteManager *self)
{ {
_platform_ipx_route_changed_cb (&vtable_ip4, self, NULL); switch (obj_type) {
} case NMP_OBJECT_TYPE_IP4_ADDRESS:
_platform_ipx_route_changed_cb (&vtable_ip4, self, NULL);
static void break;
_platform_ip6_address_changed_cb (NMPlatform *platform, case NMP_OBJECT_TYPE_IP6_ADDRESS:
NMPObjectType obj_type, _platform_ipx_route_changed_cb (&vtable_ip6, self, NULL);
int ifindex, break;
gpointer platform_object, case NMP_OBJECT_TYPE_IP4_ROUTE:
NMPlatformSignalChangeType change_type, _platform_ipx_route_changed_cb (&vtable_ip4, self, (const NMPlatformIPRoute *) platform_object);
NMPlatformReason reason, break;
NMDefaultRouteManager *self) case NMP_OBJECT_TYPE_IP6_ROUTE:
{ _platform_ipx_route_changed_cb (&vtable_ip6, self, (const NMPlatformIPRoute *) platform_object);
_platform_ipx_route_changed_cb (&vtable_ip6, self, NULL); break;
} default:
g_return_if_reached ();
static void }
_platform_ip4_route_changed_cb (NMPlatform *platform,
NMPObjectType obj_type,
int ifindex,
gpointer platform_object,
NMPlatformSignalChangeType change_type,
NMPlatformReason reason,
NMDefaultRouteManager *self)
{
_platform_ipx_route_changed_cb (&vtable_ip4, self, platform_object);
}
static void
_platform_ip6_route_changed_cb (NMPlatform *platform,
NMPObjectType obj_type,
int ifindex,
gpointer platform_object,
NMPlatformSignalChangeType change_type,
NMPlatformReason reason,
NMDefaultRouteManager *self)
{
_platform_ipx_route_changed_cb (&vtable_ip6, self, platform_object);
} }
/***********************************************************************************/ /***********************************************************************************/
@ -1371,10 +1350,10 @@ nm_default_route_manager_init (NMDefaultRouteManager *self)
priv->entries_ip6 = g_ptr_array_new_full (0, (GDestroyNotify) _entry_free); priv->entries_ip6 = g_ptr_array_new_full (0, (GDestroyNotify) _entry_free);
priv->platform = g_object_ref (nm_platform_get ()); priv->platform = g_object_ref (nm_platform_get ());
g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, G_CALLBACK (_platform_ip4_address_changed_cb), self); g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, G_CALLBACK (_platform_changed_cb), self);
g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, G_CALLBACK (_platform_ip6_address_changed_cb), self); g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, G_CALLBACK (_platform_changed_cb), self);
g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_platform_ip4_route_changed_cb), self); g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_platform_changed_cb), self);
g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_platform_ip6_route_changed_cb), self); g_signal_connect (priv->platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_platform_changed_cb), self);
} }
static void static void
@ -1386,7 +1365,7 @@ dispose (GObject *object)
priv->disposed = TRUE; priv->disposed = TRUE;
if (priv->platform) { if (priv->platform) {
g_signal_handlers_disconnect_by_data (priv->platform, self); g_signal_handlers_disconnect_by_func (priv->platform, G_CALLBACK (_platform_changed_cb), self);
g_clear_object (&priv->platform); g_clear_object (&priv->platform);
} }