summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-07-25 17:47:11 +0200
committerThomas Haller <thaller@redhat.com>2022-07-26 13:09:20 +0200
commit0b9384187b89bd8ef1f42761a8ce81f417eff140 (patch)
treec2886b097a31148b5e465b25ecb2182969280b03
parent766349879ed2d822fca12a7b38426a3a418aad54 (diff)
downloadNetworkManager-0b9384187b89bd8ef1f42761a8ce81f417eff140.tar.gz
platform: fix identity for MPTCP NMPObject to honor port
-rw-r--r--src/libnm-platform/nmp-object.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c
index eb5306a66d..edccef3373 100644
--- a/src/libnm-platform/nmp-object.c
+++ b/src/libnm-platform/nmp-object.c
@@ -1564,6 +1564,8 @@ _vt_cmd_plobj_id_cmp(mptcp_addr, NMPlatformMptcpAddr, {
* 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);
}
});
@@ -1657,7 +1659,7 @@ _vt_cmd_plobj_id_hash_update(mptcp_addr, NMPlatformMptcpAddr, {
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);
+ 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));
}
});