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

vrrpd: fix some clang-analyze warnings

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-05-17 16:25:57 +00:00
parent d8d78e2ca9
commit bdf1666144
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vrrpd/vrrp.c
View File

@ -308,7 +308,7 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
/* Must not already be started */ /* Must not already be started */
start = r->fsm.state == VRRP_STATE_INITIALIZE; start = r->fsm.state == VRRP_STATE_INITIALIZE;
/* Must not be v2 */ /* Must not be v2 */
start = vr->version != 2; start = start && vr->version != 2;
whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : NULL; whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : NULL;
/* Must have a parent interface */ /* Must have a parent interface */
start = start && (vr->ifp != NULL); start = start && (vr->ifp != NULL);
@ -1128,6 +1128,7 @@ static int vrrp_socket(struct vrrp_router *r)
r->vr->vrid, family2str(r->family)); r->vr->vrid, family2str(r->family));
/* Join Rx socket to VRRP IPv4 multicast group */ /* Join Rx socket to VRRP IPv4 multicast group */
assert(listhead(r->vr->ifp->connected));
struct connected *c = listhead(r->vr->ifp->connected)->data; struct connected *c = listhead(r->vr->ifp->connected)->data;
struct in_addr v4 = c->address->u.prefix4; 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); thread_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read);
/* Configure effective priority */ /* Configure effective priority */
assert(listhead(r->addrs));
struct ipaddr *primary = (struct ipaddr *)listhead(r->addrs)->data; struct ipaddr *primary = (struct ipaddr *)listhead(r->addrs)->data;
char ipbuf[INET6_ADDRSTRLEN]; char ipbuf[INET6_ADDRSTRLEN];