]> git.puffer.fish Git - mirror/frr.git/commitdiff
pim6d: reenable socket functions
authorDavid Lamparter <equinox@opensourcerouting.org>
Sat, 12 Mar 2022 21:08:35 +0000 (22:08 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Mar 2022 12:13:23 +0000 (14:13 +0200)
pim_sock_*() functions are adapted for IPv6 now, reenable calling them.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
pimd/pim_iface.c

index 8e0e418a9949ffec4a8ce646083df018930724e0..4470d05663e02abb577936c64dcf8e60456742db 100644 (file)
@@ -187,9 +187,7 @@ struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim,
 
        ifp->info = pim_ifp;
 
-#if PIM_IPV == 4
        pim_sock_reset(ifp);
-#endif
 
        pim_if_add_vif(ifp, ispimreg, is_vxlan_term);
        pim_ifp->pim->mcast_if_count++;
@@ -1751,7 +1749,6 @@ static int pim_ifp_down(struct interface *ifp)
                */
                pim_if_addr_del_all(ifp);
 
-#if PIM_IPV == 4
                /*
                  pim_sock_delete() closes the socket, stops read and timer
                  threads,
@@ -1760,7 +1757,6 @@ static int pim_ifp_down(struct interface *ifp)
                if (ifp->info) {
                        pim_sock_delete(ifp, "link down");
                }
-#endif
        }
 
        if (ifp->info) {