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

platform: add NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID for comparing ECMP base route

Browse source
This commit is contained in:
Thomas Haller 2022-11-08 15:56:56 +01:00 • committed by Fernando Fernandez Mancera
parent 9270bf611f
commit 8cc41d41fe
2 changed files with 56 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/libnm-platform/nm-platform.c
View file

@ -8213,6 +8213,8 @@ nm_platform_ip4_route_hash_update(const NMPlatformIP4Route *obj,
{ {
switch (cmp_type) { switch (cmp_type) {
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID:
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID:
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID:
nm_hash_update_vals( nm_hash_update_vals(
h, h,
nm_platform_ip_route_get_effective_table(NM_PLATFORM_IP_ROUTE_CAST(obj)), nm_platform_ip_route_get_effective_table(NM_PLATFORM_IP_ROUTE_CAST(obj)),
@ -8221,42 +8223,38 @@ nm_platform_ip4_route_hash_update(const NMPlatformIP4Route *obj,
obj->metric, obj->metric,
obj->tos, obj->tos,
NM_HASH_COMBINE_BOOLS(guint8, obj->metric_any, obj->table_any)); NM_HASH_COMBINE_BOOLS(guint8, obj->metric_any, obj->table_any));
break; if (NM_IN_SET(cmp_type,
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID: NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID,
nm_hash_update_vals( NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID)) {
h, nm_hash_update_vals(h,
obj->type_coerced, obj->type_coerced,
nm_platform_ip_route_get_effective_table(NM_PLATFORM_IP_ROUTE_CAST(obj)), nmp_utils_ip_config_source_round_trip_rtprot(obj->rt_source),
nm_ip4_addr_clear_host_address(obj->network, obj->plen), _ip_route_scope_inv_get_normalized(obj),
obj->plen, obj->mss,
obj->metric, obj->pref_src,
obj->tos, obj->window,
/* on top of WEAK_ID: */ obj->cwnd,
obj->ifindex, obj->initcwnd,
nmp_utils_ip_config_source_round_trip_rtprot(obj->rt_source), obj->initrwnd,
_ip_route_scope_inv_get_normalized(obj), obj->mtu,
nm_platform_ip4_route_get_n_nexthops(obj), obj->rto_min,
obj->gateway, obj->r_rtm_flags & RTNH_F_ONLINK,
(guint8) NM_MAX(obj->weight, 1u), NM_HASH_COMBINE_BOOLS(guint16,
obj->mss, obj->quickack,
obj->pref_src, obj->lock_window,
obj->window, obj->lock_cwnd,
obj->cwnd, obj->lock_initcwnd,
obj->initcwnd, obj->lock_initrwnd,
obj->initrwnd, obj->lock_mtu,
obj->mtu, obj->lock_mss));
obj->rto_min, if (cmp_type == NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID) {
obj->r_rtm_flags & RTNH_F_ONLINK, nm_hash_update_vals(h,
NM_HASH_COMBINE_BOOLS(guint16, obj->ifindex,
obj->metric_any, nm_platform_ip4_route_get_n_nexthops(obj),
obj->table_any, obj->gateway,
obj->quickack, (guint8) NM_MAX(obj->weight, 1u));
obj->lock_window, }
obj->lock_cwnd, }
obj->lock_initcwnd,
obj->lock_initrwnd,
obj->lock_mtu,
obj->lock_mss));
break; break;
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_SEMANTICALLY: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_SEMANTICALLY:
nm_hash_update_vals( nm_hash_update_vals(
@ -8362,6 +8360,7 @@ nm_platform_ip4_route_cmp(const NMPlatformIP4Route *a,
{ {
NM_CMP_SELF(a, b); NM_CMP_SELF(a, b);
switch (cmp_type) { switch (cmp_type) {
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID:
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID:
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID:
NM_CMP_FIELD_UNSAFE(a, b, table_any); NM_CMP_FIELD_UNSAFE(a, b, table_any);
@ -8372,17 +8371,14 @@ nm_platform_ip4_route_cmp(const NMPlatformIP4Route *a,
NM_CMP_FIELD_UNSAFE(a, b, metric_any); NM_CMP_FIELD_UNSAFE(a, b, metric_any);
NM_CMP_FIELD(a, b, metric); NM_CMP_FIELD(a, b, metric);
NM_CMP_FIELD(a, b, tos); NM_CMP_FIELD(a, b, tos);
if (cmp_type == NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID) { if (NM_IN_SET(cmp_type,
NM_CMP_FIELD(a, b, ifindex); NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID,
NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID)) {
NM_CMP_FIELD(a, b, type_coerced); NM_CMP_FIELD(a, b, type_coerced);
NM_CMP_DIRECT(nmp_utils_ip_config_source_round_trip_rtprot(a->rt_source), NM_CMP_DIRECT(nmp_utils_ip_config_source_round_trip_rtprot(a->rt_source),
nmp_utils_ip_config_source_round_trip_rtprot(b->rt_source)); nmp_utils_ip_config_source_round_trip_rtprot(b->rt_source));
NM_CMP_DIRECT(_ip_route_scope_inv_get_normalized(a), NM_CMP_DIRECT(_ip_route_scope_inv_get_normalized(a),
_ip_route_scope_inv_get_normalized(b)); _ip_route_scope_inv_get_normalized(b));
NM_CMP_DIRECT(nm_platform_ip4_route_get_n_nexthops(a),
nm_platform_ip4_route_get_n_nexthops(b));
NM_CMP_FIELD(a, b, gateway);
NM_CMP_DIRECT(NM_MAX(a->weight, 1u), NM_MAX(b->weight, 1u));
NM_CMP_FIELD(a, b, mss); NM_CMP_FIELD(a, b, mss);
NM_CMP_FIELD(a, b, pref_src); NM_CMP_FIELD(a, b, pref_src);
NM_CMP_FIELD(a, b, window); NM_CMP_FIELD(a, b, window);
@ -8399,6 +8395,13 @@ nm_platform_ip4_route_cmp(const NMPlatformIP4Route *a,
NM_CMP_FIELD_UNSAFE(a, b, lock_initrwnd); NM_CMP_FIELD_UNSAFE(a, b, lock_initrwnd);
NM_CMP_FIELD_UNSAFE(a, b, lock_mtu); NM_CMP_FIELD_UNSAFE(a, b, lock_mtu);
NM_CMP_FIELD_UNSAFE(a, b, lock_mss); NM_CMP_FIELD_UNSAFE(a, b, lock_mss);
if (cmp_type == NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID) {
NM_CMP_FIELD(a, b, ifindex);
NM_CMP_FIELD(a, b, gateway);
NM_CMP_DIRECT(NM_MAX(a->weight, 1u), NM_MAX(b->weight, 1u));
NM_CMP_DIRECT(nm_platform_ip4_route_get_n_nexthops(a),
nm_platform_ip4_route_get_n_nexthops(b));
}
} }
break; break;
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_SEMANTICALLY: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_SEMANTICALLY:
@ -8484,6 +8487,9 @@ nm_platform_ip6_route_hash_update(const NMPlatformIP6Route *obj,
obj->src_plen, obj->src_plen,
NM_HASH_COMBINE_BOOLS(guint8, obj->metric_any, obj->table_any)); NM_HASH_COMBINE_BOOLS(guint8, obj->metric_any, obj->table_any));
break; break;
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID:
nm_assert_not_reached();
/* fall-through */
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID:
nm_hash_update_vals( nm_hash_update_vals(
h, h,
@ -8576,6 +8582,9 @@ nm_platform_ip6_route_cmp(const NMPlatformIP6Route *a,
{ {
NM_CMP_SELF(a, b); NM_CMP_SELF(a, b);
switch (cmp_type) { switch (cmp_type) {
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID:
nm_assert_not_reached();
/* fall-through */
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_WEAK_ID:
case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID: case NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID:
NM_CMP_FIELD_UNSAFE(a, b, table_any); NM_CMP_FIELD_UNSAFE(a, b, table_any);

5
src/libnm-platform/nm-platform.h
View file

@ -102,6 +102,11 @@ typedef enum {
*/ */
NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID, NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID,
/* IPv4 route can have multiple hops. This is the ID, by which multiple
* routes are merged according to the next hop. This is basically NM_PLATFORM_IP_ROUTE_CMP_TYPE_ID
* which ignores the next hops. */
NM_PLATFORM_IP_ROUTE_CMP_TYPE_ECMP_ID,
/* compare all fields as they make sense for kernel. For example, /* compare all fields as they make sense for kernel. For example,
* a route destination 192.168.1.5/24 is not accepted by kernel and * a route destination 192.168.1.5/24 is not accepted by kernel and
* we treat it identical to 192.168.1.0/24. Semantically these * we treat it identical to 192.168.1.0/24. Semantically these