X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.c;h=542cf1d7faf3b7888e7aa5e787ba321ebcb7f2d2;hb=d0df49f2;hp=8165f3eb3135e89af2742bc7f9721099c9d386e9;hpb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;p=vpp.git

diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
index 8165f3eb313..542cf1d7faf 100644
--- a/src/vnet/fib/fib_types.c
+++ b/src/vnet/fib/fib_types.c
@@ -25,19 +25,20 @@
 static const char* fib_protocol_names[] = FIB_PROTOCOLS;
 static const char* vnet_link_names[] = VNET_LINKS;
 static const char* fib_forw_chain_names[] = FIB_FORW_CHAINS;
+static const char* fib_mpls_lsp_mode_names[] = FIB_MPLS_LSP_MODES;
 
 u8 *
-format_fib_protocol (u8 * s, va_list ap)
+format_fib_protocol (u8 * s, va_list * ap)
 {
-    fib_protocol_t proto = va_arg(ap, int); // fib_protocol_t promotion
+    fib_protocol_t proto = va_arg(*ap, int); // fib_protocol_t promotion
 
     return (format (s, "%s", fib_protocol_names[proto]));
 }
 
 u8 *
-format_vnet_link (u8 * s, va_list ap)
+format_vnet_link (u8 * s, va_list * ap)
 {
-    vnet_link_t link = va_arg(ap, int); // vnet_link_t promotion
+    vnet_link_t link = va_arg(*ap, int); // vnet_link_t promotion
 
     return (format (s, "%s", vnet_link_names[link]));
 }
@@ -50,6 +51,30 @@ format_fib_forw_chain_type (u8 * s, va_list * args)
     return (format (s, "%s", fib_forw_chain_names[fct]));
 }
 
+u8 *
+format_fib_mpls_lsp_mode(u8 *s, va_list *ap)
+{
+    fib_mpls_lsp_mode_t mode = va_arg(*ap, int);
+
+    return (format (s, "%s", fib_mpls_lsp_mode_names[mode])); 
+}
+
+u8 *
+format_fib_mpls_label (u8 *s, va_list *ap)
+{
+    fib_mpls_label_t *label = va_arg(*ap, fib_mpls_label_t *);
+
+    s = format(s, "%U %U ttl:%d exp:%d",
+               format_mpls_unicast_label,
+               label->fml_value,
+               format_fib_mpls_lsp_mode,
+               label->fml_mode,
+               label->fml_ttl,
+               label->fml_exp);
+
+    return (s);
+}
+
 void
 fib_prefix_from_ip46_addr (const ip46_address_t *addr,
 			   fib_prefix_t *pfx)
@@ -257,6 +282,40 @@ fib_proto_to_link (fib_protocol_t proto)
     return (0);
 }
 
+ip46_type_t
+fib_proto_to_ip46 (fib_protocol_t fproto)
+{
+    switch (fproto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (IP46_TYPE_IP4);
+    case FIB_PROTOCOL_IP6:
+	return (IP46_TYPE_IP6);
+    case FIB_PROTOCOL_MPLS:
+	return (IP46_TYPE_ANY);
+    }
+    ASSERT(0);
+    return (IP46_TYPE_ANY);
+}
+
+fib_protocol_t
+fib_proto_from_ip46 (ip46_type_t iproto)
+{
+    switch (iproto)
+    {
+    case IP46_TYPE_IP4:
+        return FIB_PROTOCOL_IP4;
+    case IP46_TYPE_IP6:
+        return FIB_PROTOCOL_IP6;
+    case IP46_TYPE_ANY:
+        ASSERT(0);
+        return FIB_PROTOCOL_IP4;
+    }
+
+    ASSERT(0);
+    return FIB_PROTOCOL_IP4;
+}
+
 fib_forward_chain_type_t
 fib_forw_chain_type_from_dpo_proto (dpo_proto_t proto)
 {
@@ -272,6 +331,8 @@ fib_forw_chain_type_from_dpo_proto (dpo_proto_t proto)
 	return (FIB_FORW_CHAIN_TYPE_ETHERNET);
     case DPO_PROTO_NSH:
         return (FIB_FORW_CHAIN_TYPE_NSH);
+    case DPO_PROTO_BIER:
+	return (FIB_FORW_CHAIN_TYPE_BIER);
     }
     ASSERT(0);
     return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
@@ -293,6 +354,7 @@ fib_forw_chain_type_to_link_type (fib_forward_chain_type_t fct)
     case FIB_FORW_CHAIN_TYPE_NSH:
         return (VNET_LINK_NSH);
     case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+    case FIB_FORW_CHAIN_TYPE_BIER:
 	/*
 	 * insufficient information to to convert
 	 */
@@ -304,6 +366,29 @@ fib_forw_chain_type_to_link_type (fib_forward_chain_type_t fct)
     return (VNET_LINK_IP4);
 }
 
+fib_forward_chain_type_t
+fib_forw_chain_type_from_link_type (vnet_link_t link_type)
+{
+    switch (link_type)
+    {
+    case VNET_LINK_IP4:
+        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case VNET_LINK_IP6:
+        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    case VNET_LINK_MPLS:
+        return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    case VNET_LINK_ETHERNET:
+        return (FIB_FORW_CHAIN_TYPE_ETHERNET);
+    case VNET_LINK_NSH:
+        return (FIB_FORW_CHAIN_TYPE_NSH);
+    case VNET_LINK_ARP:
+        break;
+    }
+
+    ASSERT(0);
+    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
+
 dpo_proto_t
 fib_forw_chain_type_to_dpo_proto (fib_forward_chain_type_t fct)
 {
@@ -319,9 +404,181 @@ fib_forw_chain_type_to_dpo_proto (fib_forward_chain_type_t fct)
 	return (DPO_PROTO_ETHERNET);
     case FIB_FORW_CHAIN_TYPE_NSH:
         return (DPO_PROTO_NSH);
+    case FIB_FORW_CHAIN_TYPE_BIER:
+	return (DPO_PROTO_BIER);
     case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
     case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
 	return (DPO_PROTO_MPLS);
     }
     return (DPO_PROTO_IP4);
 }
+
+uword
+unformat_fib_route_path (unformat_input_t * input, va_list * args)
+{
+    fib_route_path_t *rpath = va_arg (*args, fib_route_path_t *);
+    u32 *payload_proto = va_arg (*args, u32*);
+    u32 weight, preference, udp_encap_id;
+    mpls_label_t out_label;
+    vnet_main_t *vnm;
+
+    vnm = vnet_get_main ();
+    memset(rpath, 0, sizeof(*rpath));
+    rpath->frp_weight = 1;
+    rpath->frp_sw_if_index = ~0;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (input, "%U %U",
+                      unformat_ip4_address,
+                      &rpath->frp_addr.ip4,
+                      unformat_vnet_sw_interface, vnm,
+                      &rpath->frp_sw_if_index))
+        {
+            rpath->frp_proto = DPO_PROTO_IP4;
+        }
+        else if (unformat (input, "%U %U",
+                           unformat_ip6_address,
+                           &rpath->frp_addr.ip6,
+                           unformat_vnet_sw_interface, vnm,
+                           &rpath->frp_sw_if_index))
+        {
+            rpath->frp_proto = DPO_PROTO_IP6;
+        }
+        else if (unformat (input, "weight %u", &weight))
+        {
+            rpath->frp_weight = weight;
+        }
+        else if (unformat (input, "preference %u", &preference))
+        {
+            rpath->frp_preference = preference;
+        }
+        else if (unformat (input, "%U next-hop-table %d",
+                           unformat_ip4_address,
+                           &rpath->frp_addr.ip4,
+                           &rpath->frp_fib_index))
+        {
+            rpath->frp_sw_if_index = ~0;
+            rpath->frp_proto = DPO_PROTO_IP4;
+        }
+        else if (unformat (input, "%U next-hop-table %d",
+                           unformat_ip6_address,
+                           &rpath->frp_addr.ip6,
+                           &rpath->frp_fib_index))
+        {
+            rpath->frp_sw_if_index = ~0;
+            rpath->frp_proto = DPO_PROTO_IP6;
+        }
+        else if (unformat (input, "%U",
+                           unformat_ip4_address,
+                           &rpath->frp_addr.ip4))
+        {
+            /*
+             * the recursive next-hops are by default in the default table
+             */
+            rpath->frp_fib_index = 0;
+            rpath->frp_sw_if_index = ~0;
+            rpath->frp_proto = DPO_PROTO_IP4;
+        }
+        else if (unformat (input, "%U",
+                           unformat_ip6_address,
+                           &rpath->frp_addr.ip6))
+        {
+            rpath->frp_fib_index = 0;
+            rpath->frp_sw_if_index = ~0;
+            rpath->frp_proto = DPO_PROTO_IP6;
+        }
+        else if (unformat (input, "udp-encap %d", &udp_encap_id))
+        {
+            rpath->frp_udp_encap_id = udp_encap_id;
+            rpath->frp_flags |= FIB_ROUTE_PATH_UDP_ENCAP;
+            rpath->frp_proto = *payload_proto;
+        }
+        else if (unformat (input, "lookup in table %d", &rpath->frp_fib_index))
+        {
+            rpath->frp_proto = *payload_proto;
+            rpath->frp_sw_if_index = ~0;
+            rpath->frp_flags |= FIB_ROUTE_PATH_DEAG;
+        }
+        else if (unformat (input, "resolve-via-host"))
+        {
+            rpath->frp_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
+        }
+        else if (unformat (input, "resolve-via-attached"))
+        {
+            rpath->frp_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
+        }
+        else if (unformat (input,
+                           "ip4-lookup-in-table %d",
+                           &rpath->frp_fib_index))
+        {
+            rpath->frp_proto = DPO_PROTO_IP4;
+            *payload_proto = DPO_PROTO_IP4;
+        }
+        else if (unformat (input,
+                           "ip6-lookup-in-table %d",
+                           &rpath->frp_fib_index))
+        {
+            rpath->frp_proto = DPO_PROTO_IP6;
+            *payload_proto = DPO_PROTO_IP6;
+        }
+        else if (unformat (input,
+                           "mpls-lookup-in-table %d",
+                           &rpath->frp_fib_index))
+        {
+            rpath->frp_proto = DPO_PROTO_MPLS;
+            *payload_proto = DPO_PROTO_MPLS;
+        }
+        else if (unformat (input, "src-lookup"))
+        {
+            rpath->frp_flags |= FIB_ROUTE_PATH_SOURCE_LOOKUP;
+        }
+        else if (unformat (input,
+                           "l2-input-on %U",
+                           unformat_vnet_sw_interface, vnm,
+                           &rpath->frp_sw_if_index))
+        {
+            rpath->frp_proto = DPO_PROTO_ETHERNET;
+            *payload_proto = DPO_PROTO_ETHERNET;
+            rpath->frp_flags |= FIB_ROUTE_PATH_INTF_RX;
+        }
+        else if (unformat (input, "via-label %U",
+                           unformat_mpls_unicast_label,
+                           &rpath->frp_local_label))
+        {
+            rpath->frp_eos = MPLS_NON_EOS;
+            rpath->frp_proto = DPO_PROTO_MPLS;
+            rpath->frp_sw_if_index = ~0;
+        }
+        else if (unformat (input, "rx-ip4 %U",
+                           unformat_vnet_sw_interface, vnm,
+                           &rpath->frp_sw_if_index))
+        {
+            rpath->frp_proto = DPO_PROTO_IP4;
+            rpath->frp_flags = FIB_ROUTE_PATH_INTF_RX;
+        }
+        else if (unformat (input, "out-labels"))
+        {
+            while (unformat (input, "%U",
+                             unformat_mpls_unicast_label, &out_label))
+            {
+                fib_mpls_label_t fml = {
+                    .fml_value = out_label,
+                };
+                vec_add1(rpath->frp_label_stack, fml);
+            }
+        }
+        else if (unformat (input, "%U",
+                           unformat_vnet_sw_interface, vnm,
+                           &rpath->frp_sw_if_index))
+        {
+            rpath->frp_proto = *payload_proto;
+        }
+        else
+        {
+            return (0);
+        }
+    }
+
+    return (1);
+}