]> git.proxmox.com Git - mirror_frr.git/commitdiff
pimd: Initialize nht_p variable
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 24 Oct 2019 23:35:46 +0000 (19:35 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 24 Oct 2019 23:35:46 +0000 (19:35 -0400)
nht_p.family and .prefixlen have code paths where we may not
initialize.  Fix.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_rp.c

index 35c040c64cec06019145ee85bb658bf3f35eab93..5542db27c9515a53ed93493d8a36c2e33bae1f1a 100644 (file)
@@ -922,10 +922,11 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
                }
        }
 
+       nht_p.family = AF_INET;
+       nht_p.prefixlen = IPV4_MAX_BITLEN;
+
        /* Deregister old RP addr with Zebra NHT */
        if (rp_info->rp.rpf_addr.u.prefix4.s_addr != INADDR_ANY) {
-               nht_p.family = AF_INET;
-               nht_p.prefixlen = IPV4_MAX_BITLEN;
                nht_p.u.prefix4 = rp_info->rp.rpf_addr.u.prefix4;
                if (PIM_DEBUG_PIM_NHT_RP) {
                        char buf[PREFIX2STR_BUFFER];