]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Remove redistribution request 2532/head
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 22 Jun 2018 14:45:03 +0000 (10:45 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 28 Jun 2018 00:01:22 +0000 (20:01 -0400)
pim does not pay attention to redistribution events
from zebra so let's not request them.

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

index ae7f61c8eb1c2d9787ffa539946e3a47d2224b0a..cb384bfe1da8d2dd021f2c18a44c91df73d3d459 100644 (file)
@@ -737,8 +737,6 @@ static void pim_zebra_connected(struct zclient *zclient)
 
 void pim_zebra_init(void)
 {
-       int i;
-
        /* Socket for receiving updates from Zebra daemon */
        zclient = zclient_new_notify(master, &zclient_options_default);
 
@@ -754,31 +752,7 @@ void pim_zebra_init(void)
 
        zclient_init(zclient, ZEBRA_ROUTE_PIM, 0, &pimd_privs);
        if (PIM_DEBUG_PIM_TRACE) {
-               zlog_info("zclient_init cleared redistribution request");
-       }
-
-       /* Request all redistribution */
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (i == zclient->redist_default)
-                       continue;
-               vrf_bitmap_set(zclient->redist[AFI_IP][i], pimg->vrf_id);
-               ;
-               if (PIM_DEBUG_PIM_TRACE) {
-                       zlog_debug("%s: requesting redistribution for %s (%i)",
-                                  __PRETTY_FUNCTION__, zebra_route_string(i),
-                                  i);
-               }
-       }
-
-       /* Request default information */
-       zclient_redistribute_default(ZEBRA_REDISTRIBUTE_DEFAULT_ADD, zclient,
-                                    pimg->vrf_id);
-
-       if (PIM_DEBUG_PIM_TRACE) {
-               zlog_info("%s: requesting default information redistribution",
-                         __PRETTY_FUNCTION__);
-
-               zlog_notice("%s: zclient update socket initialized",
+               zlog_notice("%s: zclient socket initialized",
                            __PRETTY_FUNCTION__);
        }