X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmpls%2Fmpls_tunnel.h;h=c060191f460767bc32670f6ef3b940130c10f905;hb=34bfa50b61f8cf454ddce9f378e3d5d29f74a72b;hp=ec0729a0f9185cfa1d867e099cbee6c0e87d3235;hpb=9f171f5e20d4f30316626987a3dc66c9730e6d73;p=vpp.git

diff --git a/src/vnet/mpls/mpls_tunnel.h b/src/vnet/mpls/mpls_tunnel.h
index ec0729a0f91..c060191f460 100644
--- a/src/vnet/mpls/mpls_tunnel.h
+++ b/src/vnet/mpls/mpls_tunnel.h
@@ -22,15 +22,20 @@
 typedef enum mpls_tunnel_attribute_t_
 {
     MPLS_TUNNEL_ATTRIBUTE_FIRST = 0,
+    /**
+     * @brief The tunnel is L2 only
+     */
+    MPLS_TUNNEL_ATTRIBUTE_L2 = MPLS_TUNNEL_ATTRIBUTE_FIRST,
     /**
      * @brief The tunnel has an underlying multicast LSP
      */
-    MPLS_TUNNEL_ATTRIBUTE_MCAST = MPLS_TUNNEL_ATTRIBUTE_FIRST,
+    MPLS_TUNNEL_ATTRIBUTE_MCAST,
     MPLS_TUNNEL_ATTRIBUTE_LAST = MPLS_TUNNEL_ATTRIBUTE_MCAST,
 } mpls_tunnel_attribute_t;
 
 #define MPLS_TUNNEL_ATTRIBUTES {		  \
     [MPLS_TUNNEL_ATTRIBUTE_MCAST]  = "multicast", \
+    [MPLS_TUNNEL_ATTRIBUTE_L2]     = "L2",   \
 }
 #define FOR_EACH_MPLS_TUNNEL_ATTRIBUTE(_item)		\
     for (_item = MPLS_TUNNEL_ATTRIBUTE_FIRST;		\
@@ -39,6 +44,7 @@ typedef enum mpls_tunnel_attribute_t_
 
 typedef enum mpls_tunnel_flag_t_ {
     MPLS_TUNNEL_FLAG_NONE   = 0,
+    MPLS_TUNNEL_FLAG_L2     = (1 << MPLS_TUNNEL_ATTRIBUTE_L2),
     MPLS_TUNNEL_FLAG_MCAST  = (1 << MPLS_TUNNEL_ATTRIBUTE_MCAST),
 } __attribute__ ((packed)) mpls_tunnel_flags_t;
 
@@ -59,47 +65,40 @@ typedef struct mpls_tunnel_t_
     mpls_tunnel_flags_t mt_flags;
 
     /**
-     * @brief If the tunnel is an L2 tunnel, this is the link type ETHERNET
-     * adjacency
+     * @brief User defined name tag for this MPLS Tunnel.
      */
-    adj_index_t mt_l2_adj;
+    u8 mt_tag[64];
 
     /**
-     * @brief on a L2 tunnel this is the VLIB arc from the L2-tx to the l2-midchain
+     * @brief If the tunnel is an L2 tunnel, this is the link type ETHERNET
+     * load-balance
      */
-    u32 mt_l2_tx_arc;
+    dpo_id_t mt_l2_lb;
 
     /**
-     * @brief The path-list over which the tunnel's destination is reachable
-     */
-    fib_node_index_t mt_path_list;
-
-    /**
-     * @brief sibling index on the path-list so notifications are received.
+     * @brief The HW interface index of the tunnel interfaces
      */
-    u32 mt_sibling_index;
+    u32 mt_hw_if_index;
 
     /**
-     * A vector of path extensions o hold the label stack for each path
+     * @brief The SW interface index of the tunnel interfaces
      */
-    fib_path_ext_t *mt_path_exts;
+    u32 mt_sw_if_index;
 
     /**
-     * @brief Flag to indicate the tunnel is only for L2 traffic, that is
-     * this tunnel belongs in a bridge domain.
+     * @brief The path-list over which the tunnel's destination is reachable
      */
-    u8 mt_l2_only;
+    fib_node_index_t mt_path_list;
 
     /**
-     * @brief The HW interface index of the tunnel interfaces
+     * @brief sibling index on the path-list so notifications are received.
      */
-    u32 mt_hw_if_index;
+    u32 mt_sibling_index;
 
     /**
-     * @brief The SW interface index of the tunnel interfaces
+     * A vector of path extensions o hold the label stack for each path
      */
-    u32 mt_sw_if_index;
-
+    fib_path_ext_list_t mt_path_exts;
 } mpls_tunnel_t;
 
 /**
@@ -107,7 +106,8 @@ typedef struct mpls_tunnel_t_
  * @return the SW Interface index of the newly created tuneel
  */
 extern u32 vnet_mpls_tunnel_create (u8 l2_only,
-                                    u8 is_multicast);
+                                    u8 is_multicast,
+                                    u8 *description);
 
 /**
  * @brief Add a path to an MPLS tunnel
@@ -122,6 +122,11 @@ extern void vnet_mpls_tunnel_path_add (u32 sw_if_index,
 extern int vnet_mpls_tunnel_path_remove (u32 sw_if_index,
                                          fib_route_path_t *rpath);
 
+/**
+ * @brief return the tunnel index from the sw_if_index
+ */
+extern int vnet_mpls_tunnel_get_index (u32 sw_if_index);
+
 /**
  * @brief Delete an MPLS tunnel
  */