commit 5d85f2dea9cc77753c68947b6b2ae56101fab9a6
author Neale Ranns <nranns@cisco.com> Tue May 02 10:17:17 2017 -0700
committer Damjan Marion <dmarion.lists@gmail.com> Tue May 02 19:24:19 2017 +0000
tree fba3b121fc71acecdcdb84ea3031d3b3b8ff408e
parent 4403690cda44134af3b9ea78d33a5cbf78a5acc9

Allow local/for-us replications for IP multicast routes on the CLI

Change-Id: I046d9402b79fdbc6a6663199ffff8e40a278fd51
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/ip/lookup.c

diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 2321c07..b9b5caa 100755
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -840,7 +840,12 @@
 			 &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))
 	;

src/vnet/mfib/mfib_entry.c

diff --git a/src/vnet/mfib/mfib_entry.c b/src/vnet/mfib/mfib_entry.c
index 847f25e..a937842 100644
--- a/src/vnet/mfib/mfib_entry.c
+++ b/src/vnet/mfib/mfib_entry.c
@@ -199,14 +199,12 @@
             {
                 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);