From bf8728dcf667af23dd601aef8855613ff5dc3ca3 Mon Sep 17 00:00:00 2001 From: Nathan Bahr Date: Tue, 24 Sep 2024 20:13:35 +0000 Subject: zebra,yang: Completely remove multicast mode from zebra Multicast mode belongs in PIM, so removing it completely from zebra. Modified `show (ip|ipv6) rpf ADDRESS` to always lookup from SAFI_MULTICAST. This means this command is now specific to the multicast table and does not necessarily reflect the PIM RPF lookup, but that should be implemented in PIM instead. Signed-off-by: Nathan Bahr --- zebra/zebra_router.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'zebra/zebra_router.c') diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c index 4022c1a26f..ae2910af41 100644 --- a/zebra/zebra_router.c +++ b/zebra/zebra_router.c @@ -23,7 +23,6 @@ DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_RT_TABLE, "Zebra VRF table"); struct zebra_router zrouter = { .multipath_num = MULTIPATH_NUM, - .ipv4_multicast_mode = MCAST_NO_CONFIG, }; static inline int @@ -221,19 +220,6 @@ uint32_t zebra_router_get_next_sequence(void) memory_order_relaxed); } -void multicast_mode_ipv4_set(enum multicast_mode mode) -{ - if (IS_ZEBRA_DEBUG_RIB) - zlog_debug("%s: multicast lookup mode set (%d)", __func__, - mode); - zrouter.ipv4_multicast_mode = mode; -} - -enum multicast_mode multicast_mode_ipv4_get(void) -{ - return zrouter.ipv4_multicast_mode; -} - void zebra_router_terminate(void) { struct zebra_router_table *zrt, *tmp; -- cgit v1.2.3