]> git.puffer.fish Git - mirror/frr.git/commitdiff
vrrpd: make useless assert useful
authorQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 14 Mar 2019 15:43:22 +0000 (15:43 +0000)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Fri, 17 May 2019 00:27:08 +0000 (00:27 +0000)
Assert would always come back true due to improper placement.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
vrrpd/vrrp_packet.c

index 102750eafeb38e01380b76e258e952db13762f79..fcbea8f6952c855a8c05e45a0a862b71be256d8d 100644 (file)
@@ -112,13 +112,14 @@ ssize_t vrrp_pkt_adver_build(struct vrrp_pkt **pkt, struct ipaddr *src,
        size_t addrsz = 0;
 
        assert(version >= 2 && version <= 3);
-       assert(!(version == 2 && v6));
 
        if (numip > 0) {
                v6 = IS_IPADDR_V6(ips[0]);
                addrsz = IPADDRSZ(ips[0]);
        }
 
+       assert(!(version == 2 && v6));
+
        size_t pktsize = VRRP_PKT_SIZE(v6 ? AF_INET6 : AF_INET, version, numip);
        *pkt = XCALLOC(MTYPE_VRRP_PKT, pktsize);