From 5d85f2dea9cc77753c68947b6b2ae56101fab9a6 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 2 May 2017 10:17:17 -0700 Subject: Allow local/for-us replications for IP multicast routes on the CLI Change-Id: I046d9402b79fdbc6a6663199ffff8e40a278fd51 Signed-off-by: Neale Ranns --- src/vnet/ip/lookup.c | 7 ++++++- src/vnet/mfib/mfib_entry.c | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c index 2321c072..b9b5caa5 100755 --- a/src/vnet/ip/lookup.c +++ b/src/vnet/ip/lookup.c @@ -840,7 +840,12 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, &rpath.frp_sw_if_index)) { rpath.frp_weight = 1; - rpath.frp_proto = FIB_PROTOCOL_IP4; + } + else if (unformat (line_input, "via local")) + { + rpath.frp_sw_if_index = ~0; + rpath.frp_weight = 1; + rpath.frp_flags |= FIB_ROUTE_PATH_LOCAL; } else if (unformat (line_input, "%U", unformat_mfib_itf_flags, &iflags)) ; diff --git a/src/vnet/mfib/mfib_entry.c b/src/vnet/mfib/mfib_entry.c index 847f25e7..a9378425 100644 --- a/src/vnet/mfib/mfib_entry.c +++ b/src/vnet/mfib/mfib_entry.c @@ -199,14 +199,12 @@ format_mfib_entry (u8 * s, va_list * args) { s = fib_path_list_format(msrc->mfes_pl, s); } - s = format (s, " Extensions:\n", - mfib_source_names[msrc->mfes_src]); + s = format (s, " Extensions:\n"); hash_foreach(path_index, mpi, msrc->mfes_exts, ({ s = format(s, " %U\n", format_mfib_entry_path_ext, mpi); })); - s = format (s, " Interface-Forwarding:\n", - mfib_source_names[msrc->mfes_src]); + s = format (s, " Interface-Forwarding:\n"); hash_foreach(sw_if_index, mfi, msrc->mfes_itfs, ({ s = format(s, " %U\n", format_mfib_itf, mfi); -- cgit 1.2.3-korg