pimd: Modify pim_mroute_socket_[enable|disable] to be vrf aware

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index c92bad6c4d801623262d8f8ef110ca6aaef53c3d..70dc38c714d194fc23596637bddee6d4ab15b0c2 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -658,7 +658,7 @@ static void mroute_read_off()
        THREAD_OFF(qpim_mroute_socket_reader);
 }
 
-int pim_mroute_socket_enable()
+int pim_mroute_socket_enable(struct pim_instance *pim)
 {
        int fd;
 
@@ -686,31 +686,31 @@ int pim_mroute_socket_enable()
                return -3;
        }
 
-       pimg->mroute_socket = fd;
-       pimg->mroute_socket_creation = pim_time_monotonic_sec();
+       pim->mroute_socket = fd;
+       pim->mroute_socket_creation = pim_time_monotonic_sec();
 
        mroute_read_on();
 
        return 0;
 }
 
-int pim_mroute_socket_disable()
+int pim_mroute_socket_disable(struct pim_instance *pim)
 {
-       if (pim_mroute_set(pimg->mroute_socket, 0)) {
+       if (pim_mroute_set(pim->mroute_socket, 0)) {
                zlog_warn(
                        "Could not disable mroute on socket fd=%d: errno=%d: %s",
                        pimg->mroute_socket, errno, safe_strerror(errno));
                return -2;
        }
 
-       if (close(pimg->mroute_socket)) {
+       if (close(pim->mroute_socket)) {
                zlog_warn("Failure closing mroute socket: fd=%d errno=%d: %s",
                          pimg->mroute_socket, errno, safe_strerror(errno));
                return -3;
        }
 
        mroute_read_off();
-       pimg->mroute_socket = -1;
+       pim->mroute_socket = -1;
 
        return 0;
 }

diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h
index eb6c40b676508e7d43752d1a57981722b41ff213..2c0d1979d905c208ef8920ba3b7b0b8f59948003 100644 (file)
--- a/pimd/pim_mroute.h
+++ b/pimd/pim_mroute.h
@@ -163,8 +163,8 @@ struct igmpmsg {
   Above: from <linux/mroute.h>
 */
 
-int pim_mroute_socket_enable(void);
-int pim_mroute_socket_disable(void);
+int pim_mroute_socket_enable(struct pim_instance *pim);
+int pim_mroute_socket_disable(struct pim_instance *pim);
 
 int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr,
                       unsigned char flags);

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 0db82073af125e81c8aa62da58778d6c71896b68..0d086de077626fa4c08a62c74be07106a331130d 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -269,7 +269,7 @@ void pim_init()
        }
        qpim_static_route_list->del = (void (*)(void *))pim_static_route_free;
 
-       pim_mroute_socket_enable();
+       pim_mroute_socket_enable(pimg);
 
 
        /*