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

platform: merge branch 'th/platform-link-get-cleanup'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/58
This commit is contained in:
Thomas Haller 2018-12-03 12:27:13 +01:00
commit 8b87cd9ddf
6 changed files with 61 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/platform/nm-platform.c
View file

@ -754,6 +754,8 @@ nm_platform_link_get_obj (NMPlatform *self,
{
const NMPObject *obj_cache;
_CHECK_SELF (self, klass, NULL);
obj_cache = nmp_cache_lookup_link (nm_platform_get_cache (self), ifindex);
if ( !obj_cache
|| ( visible_only
@ -779,15 +781,7 @@ nm_platform_link_get_obj (NMPlatform *self,
const NMPlatformLink *
nm_platform_link_get (NMPlatform *self, int ifindex)
{
const NMPObject *obj;
_CHECK_SELF (self, klass, NULL);
if (ifindex <= 0)
return NULL;
obj = nm_platform_link_get_obj (self, ifindex, TRUE);
return NMP_OBJECT_CAST_LINK (obj);
return NMP_OBJECT_CAST_LINK (nm_platform_link_get_obj (self, ifindex, TRUE));
}
/**
@ -977,13 +971,9 @@ nm_platform_link_dummy_add (NMPlatform *self,
gboolean
nm_platform_link_delete (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, FALSE);
pllink = nm_platform_link_get (self, ifindex);
if (!pllink)
return FALSE;
g_return_val_if_fail (ifindex > 0, FALSE);
_LOG3D ("link: deleting");
return klass->link_delete (self, ifindex);
@ -1000,17 +990,11 @@ nm_platform_link_delete (NMPlatform *self, int ifindex)
gboolean
nm_platform_link_set_netns (NMPlatform *self, int ifindex, int netns_fd)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, FALSE);
g_return_val_if_fail (ifindex > 0, FALSE);
g_return_val_if_fail (netns_fd > 0, FALSE);
pllink = nm_platform_link_get (self, ifindex);
if (!pllink)
return FALSE;
_LOG3D ("link: move link to network namespace with fd %d", netns_fd);
return klass->link_set_netns (self, ifindex, netns_fd);
}
@ -1061,8 +1045,6 @@ nm_platform_link_get_name (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, NULL);
pllink = nm_platform_link_get (self, ifindex);
return pllink ? pllink->name : NULL;
}
@ -1080,8 +1062,6 @@ nm_platform_link_get_type (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, NM_LINK_TYPE_NONE);
pllink = nm_platform_link_get (self, ifindex);
return pllink ? pllink->type : NM_LINK_TYPE_NONE;
}
@ -1100,10 +1080,7 @@ nm_platform_link_get_type_name (NMPlatform *self, int ifindex)
{
const NMPObject *obj;
_CHECK_SELF (self, klass, NULL);
obj = nm_platform_link_get_obj (self, ifindex, TRUE);
if (!obj)
return NULL;
@ -1224,11 +1201,6 @@ nm_platform_link_get_ifi_flags (NMPlatform *self,
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, -EINVAL);
if (ifindex <= 0)
return -EINVAL;
/* include invisible links (only in netlink, not udev). */
pllink = NMP_OBJECT_CAST_LINK (nm_platform_link_get_obj (self, ifindex, FALSE));
if (!pllink)
@ -1267,8 +1239,6 @@ nm_platform_link_is_connected (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, FALSE);
pllink = nm_platform_link_get (self, ifindex);
return pllink ? pllink->connected : FALSE;
}
@ -1334,10 +1304,6 @@ nm_platform_link_get_udev_device (NMPlatform *self, int ifindex)
{
const NMPObject *obj_cache;
_CHECK_SELF (self, klass, FALSE);
g_return_val_if_fail (ifindex >= 0, NULL);
obj_cache = nm_platform_link_get_obj (self, ifindex, FALSE);
return obj_cache ? obj_cache->_link.udev.device : NULL;
}
@ -1358,10 +1324,6 @@ nm_platform_link_get_user_ipv6ll_enabled (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, FALSE);
g_return_val_if_fail (ifindex >= 0, FALSE);
pllink = nm_platform_link_get (self, ifindex);
if (pllink && pllink->inet6_addr_gen_mode_inv)
return _nm_platform_uint8_inv (pllink->inet6_addr_gen_mode_inv) == NM_IN6_ADDR_GEN_MODE_NONE;
@ -1427,12 +1389,7 @@ nm_platform_link_get_address (NMPlatform *self, int ifindex, size_t *length)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, NULL);
g_return_val_if_fail (ifindex > 0, NULL);
pllink = nm_platform_link_get (self, ifindex);
if ( !pllink
|| pllink->addr.len <= 0) {
NM_SET_OUT (length, 0);
@ -1652,8 +1609,6 @@ nm_platform_link_get_mtu (NMPlatform *self, int ifindex)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, 0);
pllink = nm_platform_link_get (self, ifindex);
return pllink ? pllink->mtu : 0;
}
@ -1836,10 +1791,6 @@ nm_platform_link_get_master (NMPlatform *self, int slave)
{
const NMPlatformLink *pllink;
_CHECK_SELF (self, klass, 0);
g_return_val_if_fail (slave >= 0, FALSE);
pllink = nm_platform_link_get (self, slave);
return pllink ? pllink->master : 0;
}
@ -1885,15 +1836,11 @@ nm_platform_link_get_lnk (NMPlatform *self, int ifindex, NMLinkType link_type, c
{
const NMPObject *obj;
_CHECK_SELF (self, klass, FALSE);
NM_SET_OUT (out_link, NULL);
g_return_val_if_fail (ifindex > 0, NULL);
obj = nm_platform_link_get_obj (self, ifindex, TRUE);
if (!obj)
if (!obj) {
NM_SET_OUT (out_link, NULL);
return NULL;
}
NM_SET_OUT (out_link, &obj->link);
@ -2218,12 +2165,11 @@ gboolean
nm_platform_link_6lowpan_get_properties (NMPlatform *self, int ifindex, int *out_parent)
{
const NMPlatformLink *plink;
_CHECK_SELF (self, klass, FALSE);
plink = nm_platform_link_get (self, ifindex);
if (!plink)
return FALSE;
if (plink->type != NM_LINK_TYPE_6LOWPAN)
return FALSE;
@ -2826,12 +2772,11 @@ nm_platform_link_veth_get_properties (NMPlatform *self, int ifindex, int *out_pe
{
const NMPlatformLink *plink;
int peer_ifindex;
_CHECK_SELF (self, klass, FALSE);
plink = nm_platform_link_get (self, ifindex);
if (!plink)
return FALSE;
if (plink->type != NM_LINK_TYPE_VETH)
return FALSE;
@ -2889,14 +2834,11 @@ nm_platform_link_tun_get_properties (NMPlatform *self,
gint64 group;
gint64 flags;
_CHECK_SELF (self, klass, FALSE);
g_return_val_if_fail (ifindex > 0, FALSE);
/* we consider also invisible links (those that are not yet in udev). */
plobj = nm_platform_link_get_obj (self, ifindex, FALSE);
if (!plobj)
return FALSE;
if (NMP_OBJECT_CAST_LINK (plobj)->type != NM_LINK_TYPE_TUN)
return FALSE;

15
src/platform/nmp-object.c
View file

@ -1976,6 +1976,8 @@ nmp_cache_lookup_link_full (const NMPCache *cache,
} else if (!ifname && !match_fn)
return NULL;
else {
const NMPObject *obj_best = NULL;
if (ifname) {
if (strlen (ifname) >= IFNAMSIZ)
return NULL;
@ -1987,16 +1989,21 @@ nmp_cache_lookup_link_full (const NMPCache *cache,
nmp_cache_iter_for_each_link (&iter, head_entry, &link) {
obj = NMP_OBJECT_UP_CAST (link);
if (visible_only && !nmp_object_is_visible (obj))
continue;
if (link_type != NM_LINK_TYPE_NONE && obj->link.type != link_type)
continue;
if (visible_only && !nmp_object_is_visible (obj))
continue;
if (match_fn && !match_fn (obj, user_data))
continue;
return obj;
/* if there are multiple candidates, prefer the visible ones. */
if ( visible_only
|| nmp_object_is_visible (obj))
return obj;
if (!obj_best)
obj_best = obj;
}
return NULL;
return obj_best;
}
}

3
src/platform/tests/test-cleanup.c
View file

@ -128,8 +128,7 @@ _nmtstp_init_tests (int *argc, char ***argv)
void
_nmtstp_setup_tests (void)
{
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME));
g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, DEVICE_NAME));
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, DEVICE_NAME, FALSE);
g_test_add_func ("/internal", test_cleanup_internal);
/* FIXME: add external cleanup check */

16
src/platform/tests/test-common.c
View file

@ -1702,10 +1702,11 @@ nmtstp_link_get (NMPlatform *platform,
/*****************************************************************************/
void
nmtstp_link_del (NMPlatform *platform,
gboolean external_command,
int ifindex,
const char *name)
nmtstp_link_delete (NMPlatform *platform,
gboolean external_command,
int ifindex,
const char *name,
gboolean require_exist)
{
gint64 end_time;
const NMPlatformLink *pllink;
@ -1718,7 +1719,10 @@ nmtstp_link_del (NMPlatform *platform,
pllink = nmtstp_link_get (platform, ifindex, name);
g_assert (pllink);
if (!pllink) {
g_assert (!require_exist);
return;
}
name = name_copy = g_strdup (pllink->name);
ifindex = pllink->ifindex;
@ -2072,7 +2076,7 @@ main (int argc, char **argv)
result = g_test_run ();
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME));
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, DEVICE_NAME, FALSE);
g_object_unref (NM_PLATFORM_GET);
return result;

13
src/platform/tests/test-common.h
View file

@ -327,10 +327,11 @@ const NMPlatformLink *nmtstp_link_vxlan_add (NMPlatform *platform,
const char *name,
const NMPlatformLnkVxlan *lnk);
void nmtstp_link_del (NMPlatform *platform,
gboolean external_command,
int ifindex,
const char *name);
void nmtstp_link_delete (NMPlatform *platform,
gboolean external_command,
int ifindex,
const char *name,
gboolean require_exist);
/*****************************************************************************/
@ -349,8 +350,8 @@ _nmtstp_env1_wrapper_setup (const NmtstTestData *test_data)
_LOGT ("TEST[%s]: setup", test_data->testpath);
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME));
g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, DEVICE_NAME));
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, DEVICE_NAME, FALSE);
g_assert_cmpint (nm_platform_link_dummy_add (NM_PLATFORM_GET, DEVICE_NAME, NULL), ==, NM_PLATFORM_ERROR_SUCCESS);
*p_ifindex = nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME);

44
src/platform/tests/test-link.c
View file

@ -343,7 +343,7 @@ test_slave (int master, int type, SignalData *master_changed)
ensure_no_signal (link_added);
ensure_no_signal (link_changed);
ensure_no_signal (link_removed);
nmtstp_link_del (NULL, -1, ifindex, NULL);
nmtstp_link_delete (NULL, -1, ifindex, NULL, TRUE);
accept_signals (master_changed, 0, 1);
accept_signals (link_changed, 0, 1);
accept_signal (link_removed);
@ -439,18 +439,18 @@ test_software (NMLinkType link_type, const char *link_typename)
free_signal (link_changed);
/* Delete */
nmtstp_link_del (NULL, -1, ifindex, DEVICE_NAME);
nmtstp_link_delete (NULL, -1, ifindex, DEVICE_NAME, TRUE);
accept_signal (link_removed);
/* Delete again */
g_assert (!nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME)));
g_assert (nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME) <= 0);
g_assert (!nm_platform_link_delete (NM_PLATFORM_GET, ifindex));
/* VLAN: Delete parent */
if (link_type == NM_LINK_TYPE_VLAN) {
SignalData *link_removed_parent = add_signal_ifindex (NM_PLATFORM_SIGNAL_LINK_CHANGED, NM_PLATFORM_SIGNAL_REMOVED, link_callback, vlan_parent);
nmtstp_link_del (NULL, -1, vlan_parent, NULL);
nmtstp_link_delete (NULL, -1, vlan_parent, NULL, TRUE);
accept_signal (link_removed_parent);
free_signal (link_removed_parent);
}
@ -534,7 +534,7 @@ test_bridge_addr (void)
g_assert_cmpint (plink->addr.len, ==, sizeof (addr));
g_assert (!memcmp (plink->addr.data, addr, sizeof (addr)));
nmtstp_link_del (NULL, -1, link.ifindex, link.name);
nmtstp_link_delete (NULL, -1, link.ifindex, link.name, TRUE);
}
/*****************************************************************************/
@ -609,7 +609,7 @@ test_internal (void)
accept_signal (link_changed);
/* Delete device */
nmtstp_link_del (NULL, -1, ifindex, DEVICE_NAME);
nmtstp_link_delete (NULL, -1, ifindex, DEVICE_NAME, TRUE);
accept_signal (link_removed);
/* Try to delete again */
@ -897,7 +897,7 @@ test_software_detect (gconstpointer user_data)
dummy = nmtstp_link_dummy_add (NM_PLATFORM_GET, FALSE, "dummy-tmp");
g_assert_cmpint (dummy->ifindex, ==, i);
nmtstp_link_del (NM_PLATFORM_GET, FALSE, dummy->ifindex, NULL);
nmtstp_link_delete (NM_PLATFORM_GET, FALSE, dummy->ifindex, NULL, TRUE);
}
if (!nmtstp_link_macvlan_add (NULL, ext, DEVICE_NAME, ifindex_parent, &lnk_macvlan))
@ -1243,9 +1243,9 @@ test_software_detect (gconstpointer user_data)
}
}
nmtstp_link_del (NULL, -1, ifindex, DEVICE_NAME);
nmtstp_link_delete (NULL, -1, ifindex, DEVICE_NAME, TRUE);
out_delete_parent:
nmtstp_link_del (NULL, -1, ifindex_parent, PARENT_NAME);
nmtstp_link_delete (NULL, -1, ifindex_parent, PARENT_NAME, TRUE);
}
static void
@ -1822,8 +1822,8 @@ test_vlan_set_xgress (void)
_assert_vlan_flags (ifindex, NM_VLAN_FLAG_REORDER_HEADERS | NM_VLAN_FLAG_GVRP);
}
nmtstp_link_del (NULL, -1, ifindex, DEVICE_NAME);
nmtstp_link_del (NULL, -1, ifindex_parent, PARENT_NAME);
nmtstp_link_delete (NULL, -1, ifindex, DEVICE_NAME, TRUE);
nmtstp_link_delete (NULL, -1, ifindex_parent, PARENT_NAME, TRUE);
}
/*****************************************************************************/
@ -1879,7 +1879,7 @@ test_create_many_links_do (guint n_devices)
if (EX == 2)
nmtstp_run_command_check ("ip link delete %s", name);
else
nmtstp_link_del (NULL, EX, g_array_index (ifindexes, int, i), name);
nmtstp_link_delete (NULL, EX, g_array_index (ifindexes, int, i), name, TRUE);
}
_LOGI (">>> process events after deleting devices...");
@ -1965,7 +1965,7 @@ test_nl_bugs_veth (void)
});
out:
nmtstp_link_del (NULL, -1, ifindex_veth0, IFACE_VETH0);
nmtstp_link_delete (NULL, -1, ifindex_veth0, IFACE_VETH0, TRUE);
g_assert (!nmtstp_link_get (NM_PLATFORM_GET, ifindex_veth0, IFACE_VETH0));
g_assert (!nmtstp_link_get (NM_PLATFORM_GET, ifindex_veth1, IFACE_VETH1));
nmtstp_namespace_handle_release (ns_handle);
@ -2018,7 +2018,7 @@ again:
}
g_assert (!nmtstp_link_get (NM_PLATFORM_GET, ifindex_bond0, IFACE_BOND0));
nmtstp_link_del (NULL, -1, ifindex_dummy0, IFACE_DUMMY0);
nmtstp_link_delete (NULL, -1, ifindex_dummy0, IFACE_DUMMY0, TRUE);
}
/*****************************************************************************/
@ -2072,8 +2072,8 @@ again:
goto again;
}
nmtstp_link_del (NULL, -1, ifindex_bridge0, IFACE_BRIDGE0);
nmtstp_link_del (NULL, -1, ifindex_dummy0, IFACE_DUMMY0);
nmtstp_link_delete (NULL, -1, ifindex_bridge0, IFACE_BRIDGE0, TRUE);
nmtstp_link_delete (NULL, -1, ifindex_dummy0, IFACE_DUMMY0, TRUE);
}
/*****************************************************************************/
@ -2637,8 +2637,8 @@ test_sysctl_rename (void)
}
nm_platform_process_events (PL);
nmtstp_link_del (PL, -1, ifindex[0], NULL);
nmtstp_link_del (PL, -1, ifindex[1], NULL);
nmtstp_link_delete (PL, -1, ifindex[0], NULL, TRUE);
nmtstp_link_delete (PL, -1, ifindex[1], NULL, TRUE);
}
/*****************************************************************************/
@ -2717,7 +2717,7 @@ test_sysctl_netns_switch (void)
else
g_assert_cmpint (ifindex_tmp, ==, -1);
nmtstp_link_del (PL, FALSE, ifindex, NULL);
nmtstp_link_delete (PL, FALSE, ifindex, NULL, TRUE);
}
/*****************************************************************************/
@ -2829,9 +2829,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
void
_nmtstp_setup_tests (void)
{
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, DEVICE_NAME));
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, SLAVE_NAME));
nm_platform_link_delete (NM_PLATFORM_GET, nm_platform_link_get_ifindex (NM_PLATFORM_GET, PARENT_NAME));
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, DEVICE_NAME, FALSE);
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, SLAVE_NAME, FALSE);
nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, PARENT_NAME, FALSE);
g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, DEVICE_NAME));
g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, SLAVE_NAME));
g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, PARENT_NAME));