From 03c254ec70917290b2fde27de1e7b37abe508ade Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Tue, 17 Mar 2020 14:25:10 +0000
Subject: fib: Always install all routers mcast addresses

Type: improvement

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: Ia8dff15855a81cf29729bdaa3ff28fbe3254fa97
---
 src/vnet/ip/ip4_forward.c  | 3 +++
 src/vnet/ip/ip_punt_drop.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/vnet/ip')

diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 95db9314d9b..7471a001e7a 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -49,6 +49,7 @@
 #include <vnet/fib/fib_entry.h>	/* for FIB table and entry creation */
 #include <vnet/fib/fib_urpf_list.h>	/* for FIB uRPF check */
 #include <vnet/fib/ip4_fib.h>
+#include <vnet/mfib/ip4_mfib.h>
 #include <vnet/dpo/load_balance.h>
 #include <vnet/dpo/load_balance_map.h>
 #include <vnet/dpo/classify_dpo.h>
@@ -761,6 +762,7 @@ ip4_add_del_interface_address_internal (vlib_main_t * vm,
     goto done;
 
   ip4_sw_interface_enable_disable (sw_if_index, !is_del);
+  ip4_mfib_interface_enable_disable (sw_if_index, !is_del);
 
   /* intf addr routes are added/deleted on admin up/down */
   if (vnet_sw_interface_is_admin_up (vnm, sw_if_index))
@@ -1061,6 +1063,7 @@ ip4_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
         ip4_add_del_interface_address(vm, sw_if_index, address, ia->address_length, 1);
       }));
       /* *INDENT-ON* */
+      ip4_mfib_interface_enable_disable (sw_if_index, 0);
     }
 
   vnet_feature_enable_disable ("ip4-unicast", "ip4-not-enabled", sw_if_index,
diff --git a/src/vnet/ip/ip_punt_drop.c b/src/vnet/ip/ip_punt_drop.c
index 01577a472ce..ce1631fd2f1 100644
--- a/src/vnet/ip/ip_punt_drop.c
+++ b/src/vnet/ip/ip_punt_drop.c
@@ -29,7 +29,7 @@ format_ip_punt_redirect_trace (u8 * s, va_list * args)
   ip_punt_redirect_trace_t *t = va_arg (*args, ip_punt_redirect_trace_t *);
 
   if (INDEX_INVALID == t->rrxi)
-    s = format (s, "drop");
+    s = format (s, "ignore");
   else
     s = format (s, "via redirect:%d", t->rrxi);
 
-- 
cgit 1.2.3-korg