summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-06-22 16:45:03 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-06-28 02:01:22 +0200
commit87270023ebb5d29f5ef7a583f919004ad2326560 (patch)
tree8255afcf6c6173712498ba737ad513ae48e9773c /pimd
parentlib, zebra: Add a bit of code to look at fifo (diff)
downloadfrr-87270023ebb5d29f5ef7a583f919004ad2326560.tar.xz
frr-87270023ebb5d29f5ef7a583f919004ad2326560.zip
pimd: Remove redistribution request
pim does not pay attention to redistribution events from zebra so let's not request them. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_zebra.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index ae7f61c8e..cb384bfe1 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -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__);
}