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

vrrpd: use ipaddr size macro

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-02-01 21:26:45 +00:00
parent 4f838de420
commit e920b0b289
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vrrpd/vrrp.c
View File

@ -146,14 +146,12 @@ void vrrp_set_advertisement_interval(struct vrrp_vrouter *vr,
static bool vrrp_has_ip(struct vrrp_vrouter *vr, struct ipaddr *ip) static bool vrrp_has_ip(struct vrrp_vrouter *vr, struct ipaddr *ip)
{ {
size_t cmpsz = ip->ipa_type == IPADDR_V4 ? sizeof(struct in_addr)
: sizeof(struct in6_addr);
struct vrrp_router *r = ip->ipa_type == IPADDR_V4 ? vr->v4 : vr->v6; struct vrrp_router *r = ip->ipa_type == IPADDR_V4 ? vr->v4 : vr->v6;
struct listnode *ln; struct listnode *ln;
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, cmpsz)) if (!memcmp(&iter->ip, &ip->ip, IPADDRSZ(ip)))
return true; return true;
return false; return false;
@ -216,8 +214,6 @@ int vrrp_add_ipv6(struct vrrp_vrouter *vr, struct in6_addr v6, bool activate)
int vrrp_del_ip(struct vrrp_router *r, struct ipaddr *ip, bool deactivate) int vrrp_del_ip(struct vrrp_router *r, struct ipaddr *ip, bool deactivate)
{ {
size_t cmpsz = ip->ipa_type == IPADDR_V4 ? sizeof(struct in_addr)
: sizeof(struct in6_addr);
struct listnode *ln, *nn; struct listnode *ln, *nn;
struct ipaddr *iter; struct ipaddr *iter;
int ret = 0; int ret = 0;
@ -235,7 +231,7 @@ int vrrp_del_ip(struct vrrp_router *r, struct ipaddr *ip, bool deactivate)
*/ */
if (ret == 0) { if (ret == 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, cmpsz)) if (!memcmp(&iter->ip, &ip->ip, IPADDRSZ(ip)))
list_delete_node(r->addrs, ln); list_delete_node(r->addrs, ln);
} }
@ -517,12 +513,10 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
} }
int addrcmp; int addrcmp;
size_t cmpsz = IS_IPADDR_V6(src) ? sizeof(struct in6_addr)
: sizeof(struct in_addr);
switch (r->fsm.state) { switch (r->fsm.state) {
case VRRP_STATE_MASTER: case VRRP_STATE_MASTER:
addrcmp = memcmp(&src->ip, &r->src.ip, cmpsz); addrcmp = memcmp(&src->ip, &r->src.ip, IPADDRSZ(src));
if (pkt->hdr.priority == 0) { if (pkt->hdr.priority == 0) {
vrrp_send_advertisement(r); vrrp_send_advertisement(r);

2
vrrpd/vrrp_packet.c
View File

@ -107,7 +107,7 @@ ssize_t vrrp_pkt_adver_build(struct vrrp_pkt **pkt, struct ipaddr *src,
bool v6 = IS_IPADDR_V6(ips[0]); bool v6 = IS_IPADDR_V6(ips[0]);
size_t addrsz = v6 ? sizeof(struct in6_addr) : sizeof(struct in_addr); size_t addrsz = IPADDRSZ(ips[0]);
size_t pktsize = VRRP_PKT_SIZE(v6 ? AF_INET6 : AF_INET, numip); size_t pktsize = VRRP_PKT_SIZE(v6 ? AF_INET6 : AF_INET, numip);
*pkt = XCALLOC(MTYPE_VRRP_PKT, pktsize); *pkt = XCALLOC(MTYPE_VRRP_PKT, pktsize);