fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 22:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: adjust identity for MPTCP addr objects

Browse source 
It's not very clear what the best identity is.

For example, in kernel you cannot add two MPTCP addresses that only differ by
ifindex. Thus (as far as kernel is concerned), the ifindex is not part of the
identity. Still, as we will have an interface centric view, this will be
useful for us.

On the other hand, to kernel is the "id" a second primary key, along
side "addr:port". However, to us it's not useful to consider that as
part of nmp_object_id_equal(), because usually kernel will pick an "id"
for us, and when we track objects that we are about to add, they don't
have an "id" yet.

So, adjust nmp_object_id_equal(). However -- somewhat unusual -- let it
deviate from kernel's understanding of what defines an MPTCP address.
This commit is contained in:
Thomas Haller 2022-07-28 18:58:45 +02:00
parent d92053fc6e
commit e1c18e9ed2
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/libnm-platform/nmp-object.c
View file

@ -1553,20 +1553,34 @@ _vt_cmd_plobj_id_cmp_routing_rule(const NMPlatformObject *obj1, const NMPlatform
}
_vt_cmd_plobj_id_cmp(mptcp_addr, NMPlatformMptcpAddr, {
NM_CMP_FIELD(obj1, obj2, id);
NM_CMP_FIELD_UNSAFE(obj1, obj2, in_kernel);
if (!obj1->in_kernel) {
/* See comment NMPlatformMptcpAddr.in_kernel for why. */
NM_CMP_FIELD(obj1, obj2, addr_family);
/* nm_utils_addr_family_to_size() asserts that addr-family is either AF_INET or AF_INET6.
* This means, we cannot compare totally bogus objects. That is in particular fine
* for instances which are not "in_kernel". While we might receive unexpected values
* from kernel, we should not create them for internal purposes. */
NM_CMP_FIELD_MEMCMP_LEN(obj1, obj2, addr, nm_utils_addr_family_to_size(obj1->addr_family));
NM_CMP_FIELD(obj1, obj2, port);
}
/* The primary key of an MPTCP endpoint is only the address:port@ifindex.
*
* Which does not fully correspond to kernel's view. Kernel's view is determined
* by the question whether you can add two objects that only differ by one
* attribute. If you can, the attribute is part of the ID otherwise it isn't.
*
* Note that for kernel, the "ifindex" is not part of the identity.
* That is, you cannot two add two endpoints that only differ by
* ifindex. However, for our purpose, it is very useful to make
* the "ifindex" part of the identity. For example, NMPGlobalTracker will use
* this to track MPTCP addresses from independent callers (NML3Cfg).
* It would be bad, if objects that differ by "ifindex" would be
* combined.
*
* The "id" is intentionally not part of the identity for us. Note however, that kernel
* does not allow configuring duplicates "id" -- so the "id" could be a primary key
* as far as kernel is concerned. However, when we track MPTCP endpoints that
* we want to configure, the "id" is left undefined (and we let kernel choose it).
* If the "id" would be part of the NMPObject's ID, we could not lookup
* an object unless we know the "id" -- which we often don't.
*/
NM_CMP_FIELD(obj1, obj2, ifindex);
NM_CMP_FIELD(obj1, obj2, addr_family);
NM_CMP_FIELD_MEMCMP_LEN(obj1,
obj2,
addr,
nm_utils_addr_family_to_size_untrusted(obj1->addr_family));
NM_CMP_FIELD(obj1, obj2, port);
});
void
@ -1655,13 +1669,9 @@ _vt_cmd_plobj_id_hash_update(tfilter, NMPlatformTfilter, {
});
_vt_cmd_plobj_id_hash_update(mptcp_addr, NMPlatformMptcpAddr, {
if (obj->in_kernel) {
nm_hash_update_val(h, obj->id);
} else {
/* _vt_cmd_plobj_id_cmp_mptcp_addr for why. */
nm_hash_update_vals(h, obj->id, obj->addr_family, obj->port);
nm_hash_update(h, &obj->addr, nm_utils_addr_family_to_size(obj->addr_family));
}
/* See the corresponding ID cmp function for details. */
nm_hash_update_vals(h, obj->addr_family, obj->port, obj->ifindex);
nm_hash_update(h, &obj->addr, nm_utils_addr_family_to_size_untrusted(obj->addr_family));
});
static void