commit da78f957e46c686434149d332a477d7ea055d76a
author Neale Ranns <nranns@cisco.com> Wed May 24 09:15:43 2017 -0700
committer Florin Coras <florin.coras@gmail.com> Tue Aug 08 17:25:00 2017 +0000
tree 4499475fa0904c4b7660dd29576857def77a29ba
parent b60f4965bf6f51eb746e18fa0307af8e3444bf96

L2 over MPLS

[support for VPWS/VPLS]
- switch to using dpo_proto_t rather than fib_protocol_t in fib_paths so that we can describe L2 paths
- VLIB nodes to handle pop/push of MPLS labels to L2

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

src/vnet/fib/fib_entry_src_rr.c

diff --git a/src/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c
index d66ef7b..1153f3f 100644
--- a/src/vnet/fib/fib_entry_src_rr.c
+++ b/src/vnet/fib/fib_entry_src_rr.c
@@ -35,7 +35,7 @@
 					const fib_entry_t *cover)
 {
     const fib_route_path_t path = {
-	.frp_proto = fib_entry->fe_prefix.fp_proto,
+	.frp_proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto),
 	.frp_addr = fib_entry->fe_prefix.fp_addr,
 	.frp_sw_if_index = fib_entry_get_resolving_interface(
 	                       fib_entry_get_index(cover)),
@@ -90,18 +90,17 @@
                                 const fib_entry_t *cover)
 {
     fib_node_index_t *entries = NULL;
-    fib_protocol_t proto;
+    dpo_proto_t proto;
 
-    proto = fib_entry->fe_prefix.fp_proto;
+    proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto);
     vec_add1(entries, fib_entry_get_index(fib_entry));
 
     if (fib_path_list_recursive_loop_detect(cover->fe_parent,
                                             &entries))
     {
-        src->fes_pl = fib_path_list_create_special(
-            proto,
-            FIB_PATH_LIST_FLAG_DROP,
-            drop_dpo_get(fib_proto_to_dpo(proto)));
+        src->fes_pl = fib_path_list_create_special(proto,
+                                                   FIB_PATH_LIST_FLAG_DROP,
+                                                   drop_dpo_get(proto));
     }
     else
     {
@@ -126,7 +125,7 @@
      */
     if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
     {
-	src->fes_pl = fib_path_list_create_special(FIB_PROTOCOL_MPLS,
+	src->fes_pl = fib_path_list_create_special(DPO_PROTO_MPLS,
 						   FIB_PATH_LIST_FLAG_DROP,
 						   NULL);
 	fib_path_list_lock(src->fes_pl);