diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-17 18:25:57 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-17 18:25:57 +0200 |
| commit | bdf1666144f84b0b00d5d0572db27ff581e91622 (patch) | |
| tree | de0dd25cc4ecd6f1cbb946e3b4b03ec140ab5c09 /vrrpd/vrrp.c | |
| parent | zebra: gracefully fail to protodown on bsd (diff) | |
| download | frr-bdf1666144f84b0b00d5d0572db27ff581e91622.tar.xz frr-bdf1666144f84b0b00d5d0572db27ff581e91622.zip | |
vrrpd: fix some clang-analyze warnings
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'vrrpd/vrrp.c')
| -rw-r--r-- | vrrpd/vrrp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index 02652d6ab..a5d4ef3f4 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -308,7 +308,7 @@ void vrrp_check_start(struct vrrp_vrouter *vr) /* Must not already be started */ start = r->fsm.state == VRRP_STATE_INITIALIZE; /* Must not be v2 */ - start = vr->version != 2; + start = start && vr->version != 2; whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : NULL; /* Must have a parent interface */ start = start && (vr->ifp != NULL); @@ -1128,6 +1128,7 @@ static int vrrp_socket(struct vrrp_router *r) r->vr->vrid, family2str(r->family)); /* Join Rx socket to VRRP IPv4 multicast group */ + assert(listhead(r->vr->ifp->connected)); struct connected *c = listhead(r->vr->ifp->connected)->data; struct in_addr v4 = c->address->u.prefix4; @@ -1526,6 +1527,7 @@ static int vrrp_startup(struct vrrp_router *r) thread_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read); /* Configure effective priority */ + assert(listhead(r->addrs)); struct ipaddr *primary = (struct ipaddr *)listhead(r->addrs)->data; char ipbuf[INET6_ADDRSTRLEN]; |