diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2025-02-11 12:22:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-11 12:22:34 -0600 |
| commit | 11a65e1e00e5e80eb39a40c567b1440c07bcf554 (patch) | |
| tree | a000cad00dd01c32e5489a7814c59249a836c731 /lib/zclient.c | |
| parent | 00fd2e65517aca600ae8521095a7a1a42d103ce7 (diff) | |
| parent | d4f9f9588f4b936afb5ac8e47f7899df39869e4b (diff) | |
Merge pull request #18086 from FRRouting/mergify/bp/stable/10.0/pr-17901
lib: actually hash all 16 bytes of IPv6 addresses, not just 4 (backport #17901)
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index 606ba91af3..0fd9b303f6 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2129,7 +2129,27 @@ struct nexthop *nexthop_from_zapi_nexthop(const struct zapi_nexthop *znh) n->type = znh->type; n->vrf_id = znh->vrf_id; n->ifindex = znh->ifindex; - n->gate = znh->gate; + + /* only copy values that have meaning - make sure "spare bytes" are + * left zeroed for hashing (look at _nexthop_hash_bytes) + */ + switch (znh->type) { + case NEXTHOP_TYPE_BLACKHOLE: + n->bh_type = znh->bh_type; + break; + case NEXTHOP_TYPE_IPV4: + case NEXTHOP_TYPE_IPV4_IFINDEX: + n->gate.ipv4 = znh->gate.ipv4; + break; + case NEXTHOP_TYPE_IPV6: + case NEXTHOP_TYPE_IPV6_IFINDEX: + n->gate.ipv6 = znh->gate.ipv6; + break; + case NEXTHOP_TYPE_IFINDEX: + /* nothing, ifindex is always copied */ + break; + } + n->srte_color = znh->srte_color; /* |