summaryrefslogtreecommitdiff
path: root/pimd/pim_zebra.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-03-22 10:07:18 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-03-23 12:59:17 -0400
commit22d0b8afcec48fd9684bea91e1d1d6236c47e6e6 (patch)
tree4806f3907e603bc581ca295e3b29a4e85eaccbab /pimd/pim_zebra.c
parent64c610f949dddd87ccb183f4c3fc450ff476b696 (diff)
pimd: When deleting last intf from an OIL don't delete the mroute
In certain conditions when we are deleting the interface from an OIL do not delete the mroute. That decision should be made by the state machine. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zebra.c')
-rw-r--r--pimd/pim_zebra.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index bf2c838abb..679ead1e0d 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -866,22 +866,6 @@ static int del_oif(struct channel_oil *channel_oil,
--channel_oil->oil_size;
- if (channel_oil->oil_size < 1) {
- if (pim_mroute_del(channel_oil, __PRETTY_FUNCTION__)) {
- if (PIM_DEBUG_MROUTE)
- {
- /* just log a warning in case of failure */
- char group_str[INET_ADDRSTRLEN];
- char source_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<group?>", channel_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
- pim_inet4_dump("<source?>", channel_oil->oil.mfcc_origin, source_str, sizeof(source_str));
- zlog_debug("%s %s: failure removing OIL for channel (S,G)=(%s,%s)",
- __FILE__, __PRETTY_FUNCTION__,
- source_str, group_str);
- }
- }
- }
-
if (PIM_DEBUG_MROUTE) {
char group_str[INET_ADDRSTRLEN];
char source_str[INET_ADDRSTRLEN];