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

platform: refactor handling netlink message by manually inlining cache functions

Browse source 
There are only one caller of the two functions. It's shorter and simpler
just to implement the short functionality right there.
This commit is contained in:
Thomas Haller 2015-12-12 22:11:33 +01:00
parent 3511530c74
commit 600a247f57
1 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/platform/nm-linux-platform.c
View file

@ -2963,51 +2963,6 @@ cache_pre_hook (NMPCache *cache, const NMPObject *old, const NMPObject *new, NMP
}
}
static NMPCacheOpsType
cache_remove_netlink (NMPlatform *platform, const NMPObject *obj_id, NMPObject **out_obj_cache, gboolean *out_was_visible)
{
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
NMPObject *obj_cache;
gboolean was_visible;
NMPCacheOpsType cache_op;
cache_op = nmp_cache_remove_netlink (priv->cache, obj_id, &obj_cache, &was_visible, cache_pre_hook, platform);
do_emit_signal (platform, obj_cache, cache_op, was_visible);
if (out_obj_cache)
*out_obj_cache = obj_cache;
else
nmp_object_unref (obj_cache);
if (out_was_visible)
*out_was_visible = was_visible;
return cache_op;
}
static NMPCacheOpsType
cache_update_netlink (NMPlatform *platform, NMPObject *obj, NMPObject **out_obj_cache, gboolean *out_was_visible)
{
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
NMPObject *obj_cache;
gboolean was_visible;
NMPCacheOpsType cache_op;
/* This is basically a convenience method to call nmp_cache_update() and do_emit_signal()
* at once. */
cache_op = nmp_cache_update_netlink (priv->cache, obj, &obj_cache, &was_visible, cache_pre_hook, platform);
do_emit_signal (platform, obj_cache, cache_op, was_visible);
if (out_obj_cache)
*out_obj_cache = obj_cache;
else
nmp_object_unref (obj_cache);
if (out_was_visible)
*out_was_visible = was_visible;
return cache_op;
}
/******************************************************************/
static int
@ -3193,9 +3148,11 @@ event_notification (struct nl_msg *msg, gpointer user_data)
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (user_data);
nm_auto_nmpobj NMPObject *obj = NULL;
nm_auto_nmpobj NMPObject *obj_cache = NULL;
NMPCacheOpsType cache_op;
struct nlmsghdr *msghdr;
char buf_nlmsg_type[16];
gboolean id_only = FALSE;
gboolean was_visible;
msghdr = nlmsg_hdr (msg);
@ -3226,13 +3183,15 @@ event_notification (struct nl_msg *msg, gpointer user_data)
case RTM_NEWLINK:
case RTM_NEWADDR:
case RTM_NEWROUTE:
cache_update_netlink (platform, obj, &obj_cache, NULL);
cache_op = nmp_cache_update_netlink (priv->cache, obj, &obj_cache, &was_visible, cache_pre_hook, platform);
do_emit_signal (platform, obj_cache, cache_op, was_visible);
break;
case RTM_DELLINK:
case RTM_DELADDR:
case RTM_DELROUTE:
cache_remove_netlink (platform, obj, &obj_cache, NULL);
cache_op = nmp_cache_remove_netlink (priv->cache, obj, &obj_cache, &was_visible, cache_pre_hook, platform);
do_emit_signal (platform, obj_cache, cache_op, was_visible);
break;
default: