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

vrrpd: use address cmp for priority tiebreak

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-02-01 21:22:18 +00:00
parent d04bb25ace
commit 0f1f98e837
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vrrpd/vrrp.c
View File

@ -464,9 +464,25 @@ static void vrrp_send_advertisement(struct vrrp_router *r)
* However, we have not validated whether the VRID is correct for this virtual * However, we have not validated whether the VRID is correct for this virtual
* router, nor whether the priority is correct (i.e. is not 255 when we are the * router, nor whether the priority is correct (i.e. is not 255 when we are the
* address owner). * address owner).
*
* r
* VRRP Router associated with the socket this advertisement was received on
*
* src
* Source address of sender
*
* pkt
* The advertisement they sent
*
* pktsize
* Size of advertisement
*
* Returns:
* -1 if advertisement is invalid
* 0 otherwise
*/ */
static int vrrp_recv_advertisement(struct vrrp_router *r, struct vrrp_pkt *pkt, static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
size_t pktsize) struct vrrp_pkt *pkt, size_t pktsize)
{ {
char dumpbuf[BUFSIZ]; char dumpbuf[BUFSIZ];
vrrp_pkt_adver_dump(dumpbuf, sizeof(dumpbuf), pkt); vrrp_pkt_adver_dump(dumpbuf, sizeof(dumpbuf), pkt);
@ -500,8 +516,14 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct vrrp_pkt *pkt,
r->addrs->count); r->addrs->count);
} }
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);
if (pkt->hdr.priority == 0) { if (pkt->hdr.priority == 0) {
vrrp_send_advertisement(r); vrrp_send_advertisement(r);
THREAD_OFF(r->t_adver_timer); THREAD_OFF(r->t_adver_timer);
@ -509,9 +531,8 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct vrrp_pkt *pkt,
master, vrrp_adver_timer_expire, r, master, vrrp_adver_timer_expire, r,
r->vr->advertisement_interval * 10, r->vr->advertisement_interval * 10,
&r->t_adver_timer); &r->t_adver_timer);
/* FIXME: 6.4.3 mandates checking sender IP address */ } else if (pkt->hdr.priority > r->priority
} else if (pkt->hdr.priority > r->priority) { || ((pkt->hdr.priority == r->priority) && addrcmp > 0)) {
zlog_err("NOT IMPLEMENTED");
THREAD_OFF(r->t_adver_timer); THREAD_OFF(r->t_adver_timer);
r->master_adver_interval = ntohs(pkt->hdr.v3.adver_int); r->master_adver_interval = ntohs(pkt->hdr.v3.adver_int);
vrrp_recalculate_timers(r); vrrp_recalculate_timers(r);
@ -606,7 +627,7 @@ static int vrrp_read(struct thread *thread)
} else { } else {
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID "Packet looks good", zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID "Packet looks good",
r->vr->vrid); r->vr->vrid);
vrrp_recv_advertisement(r, pkt, pktsize); vrrp_recv_advertisement(r, &src, pkt, pktsize);
} }
resched = true; resched = true;