aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-05-02 10:17:17 -0700
committerDamjan Marion <dmarion.lists@gmail.com>2017-05-02 19:24:19 +0000
commit5d85f2dea9cc77753c68947b6b2ae56101fab9a6 (patch)
treefba3b121fc71acecdcdb84ea3031d3b3b8ff408e
parent4403690cda44134af3b9ea78d33a5cbf78a5acc9 (diff)
Allow local/for-us replications for IP multicast routes on the CLI
Change-Id: I046d9402b79fdbc6a6663199ffff8e40a278fd51 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rwxr-xr-xsrc/vnet/ip/lookup.c7
-rw-r--r--src/vnet/mfib/mfib_entry.c6
2 files changed, 8 insertions, 5 deletions
diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 2321c072620..b9b5caa542f 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 847f25e7f1f..a937842553c 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);