proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 04:36:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Zero intial OID items in array at the beginning

Browse Source 
If OID does not have an IP address encoded, initialized every item in an
array to 0 to avoid a wrong comparison between IP addresses.

With >= 5.8 net-snmp, it works without this hack.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-12-19 22:56:41 +02:00
parent 54257fae5d
commit 2789c90994
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bgpd/bgp_snmp_bgp4v2.c
View File

@ -145,10 +145,24 @@ static struct peer *bgpv2PeerTable_lookup(struct variable *v, oid name[],
size_t namelen = v ? v->namelen : BGP4V2_PEER_ENTRY_OFFSET;
oid *offset = name + namelen;
sa_family_t family = name[namelen - 1] == 4 ? AF_INET : AF_INET6;
int afi_len = IN_ADDR_SIZE;
size_t offsetlen = *length - namelen;
if (family == AF_INET6)
afi_len = IN6_ADDR_SIZE;
/* Somehow with net-snmp 5.7.3, every OID item in an array
* is uninitialized and has a max random value, let's zero it.
* With 5.8, 5.9, it works fine even without this hack.
*/
if (!offsetlen) {
for (int i = 0; i < afi_len; i++)
*(offset + i) = 0;
}
if (exact) {
if (family == AF_INET) {
oid2in_addr(offset, IN_ADDR_SIZE, &addr->ip._v4_addr);
oid2in_addr(offset, afi_len, &addr->ip._v4_addr);
peer = peer_lookup_all_vrf(addr);
return peer;
} else if (family == AF_INET6) {
@ -163,11 +177,11 @@ static struct peer *bgpv2PeerTable_lookup(struct variable *v, oid name[],
switch (sockunion_family(&peer->su)) {
case AF_INET:
oid_copy_in_addr(offset, &peer->su.sin.sin_addr);
*length = IN_ADDR_SIZE + namelen;
*length = afi_len + namelen;
return peer;
case AF_INET6:
oid_copy_in6_addr(offset, &peer->su.sin6.sin6_addr);
*length = IN6_ADDR_SIZE + namelen;
*length = afi_len + namelen;
return peer;
default:
break;