proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 03:33:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10544 from FRRouting/mergify/bp/dev/8.2/pr-10530

Browse Source 
*: use ipaddr_cmp instead of memcmp (backport #10530)
This commit is contained in:
Donald Sharp 2022-02-09 08:12:49 -05:00 committed by GitHub
commit cd56a45488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_evpn_mh.c
View File

@ -4306,7 +4306,7 @@ static bool bgp_evpn_nh_cmp(const void *p1, const void *p2)
if (n1 == NULL || n2 == NULL) if (n1 == NULL || n2 == NULL)
return false; return false;
return (memcmp(&n1->ip, &n2->ip, sizeof(struct ipaddr)) == 0); return (ipaddr_cmp(&n1->ip, &n2->ip) == 0);
} }
void bgp_evpn_nh_init(struct bgp *bgp_vrf) void bgp_evpn_nh_init(struct bgp *bgp_vrf)

6
vrrpd/vrrp.c
View File

@ -405,7 +405,7 @@ static bool vrrp_has_ip(struct vrrp_vrouter *vr, struct ipaddr *ip)
struct ipaddr *iter; struct ipaddr *iter;
for (ALL_LIST_ELEMENTS_RO(r->addrs, ln, iter)) for (ALL_LIST_ELEMENTS_RO(r->addrs, ln, iter))
if (!memcmp(&iter->ip, &ip->ip, IPADDRSZ(ip))) if (!ipaddr_cmp(iter, ip))
return true; return true;
return false; return false;
@ -484,7 +484,7 @@ int vrrp_del_ip(struct vrrp_vrouter *vr, struct ipaddr *ip)
return 0; return 0;
for (ALL_LIST_ELEMENTS(r->addrs, ln, nn, iter)) for (ALL_LIST_ELEMENTS(r->addrs, ln, nn, iter))
if (!memcmp(&iter->ip, &ip->ip, IPADDRSZ(ip))) if (!ipaddr_cmp(iter, ip))
list_delete_node(r->addrs, ln); list_delete_node(r->addrs, ln);
/* /*
@ -903,7 +903,7 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
switch (r->fsm.state) { switch (r->fsm.state) {
case VRRP_STATE_MASTER: case VRRP_STATE_MASTER:
addrcmp = memcmp(&src->ip, &r->src.ip, IPADDRSZ(src)); addrcmp = ipaddr_cmp(src, &r->src);
if (pkt->hdr.priority == 0) { if (pkt->hdr.priority == 0) {
vrrp_send_advertisement(r); vrrp_send_advertisement(r);

4
zebra/zebra_evpn_neigh.c
View File

@ -72,7 +72,7 @@ static bool neigh_cmp(const void *p1, const void *p2)
if (n1 == NULL || n2 == NULL) if (n1 == NULL || n2 == NULL)
return false; return false;
return (memcmp(&n1->ip, &n2->ip, sizeof(struct ipaddr)) == 0); return ipaddr_cmp(&n1->ip, &n2->ip) == 0;
} }
int neigh_list_cmp(void *p1, void *p2) int neigh_list_cmp(void *p1, void *p2)
@ -80,7 +80,7 @@ int neigh_list_cmp(void *p1, void *p2)
const struct zebra_neigh *n1 = p1; const struct zebra_neigh *n1 = p1;
const struct zebra_neigh *n2 = p2; const struct zebra_neigh *n2 = p2;
return memcmp(&n1->ip, &n2->ip, sizeof(struct ipaddr)); return ipaddr_cmp(&n1->ip, &n2->ip);
} }
struct hash *zebra_neigh_db_create(const char *desc) struct hash *zebra_neigh_db_create(const char *desc)