X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_node.h;h=27e67b11c877b3e1a39c957330b8a93f55cbc58a;hb=8f5fef2c7;hp=457dfb7a6b599e78b4adebc48c34dc4bee07a581;hpb=32e1c010b0c34fd0984f7fc45fae648a182025c5;p=vpp.git

diff --git a/src/vnet/fib/fib_node.h b/src/vnet/fib/fib_node.h
index 457dfb7a6b5..27e67b11c87 100644
--- a/src/vnet/fib/fib_node.h
+++ b/src/vnet/fib/fib_node.h
@@ -39,30 +39,47 @@ typedef enum fib_node_type_t_ {
     FIB_NODE_TYPE_MPLS_TUNNEL,
     FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY,
     FIB_NODE_TYPE_LISP_ADJ,
-    FIB_NODE_TYPE_GRE_TUNNEL,
     FIB_NODE_TYPE_VXLAN_TUNNEL,
+    FIB_NODE_TYPE_MAP_E,
+    FIB_NODE_TYPE_VXLAN_GPE_TUNNEL,
+    FIB_NODE_TYPE_GENEVE_TUNNEL,
+    FIB_NODE_TYPE_UDP_ENCAP,
+    FIB_NODE_TYPE_BIER_FMASK,
+    FIB_NODE_TYPE_BIER_ENTRY,
+    FIB_NODE_TYPE_VXLAN_GBP_TUNNEL,
+    FIB_NODE_TYPE_IPSEC_SA,
+    FIB_NODE_TYPE_IP_PUNT_REDIRECT,
+    FIB_NODE_TYPE_ENTRY_TRACK,
     /**
      * Marker. New types before this one. leave the test last.
      */
     FIB_NODE_TYPE_TEST,
     FIB_NODE_TYPE_LAST = FIB_NODE_TYPE_TEST,
-} fib_node_type_t;
+} __attribute__ ((packed)) fib_node_type_t;
 
 #define FIB_NODE_TYPE_MAX (FIB_NODE_TYPE_LAST + 1)
 
-#define FIB_NODE_TYPES {                          \
-    [FIB_NODE_TYPE_ENTRY]     = "entry",          \
-    [FIB_NODE_TYPE_MFIB_ENTRY] = "mfib-entry",    \
-    [FIB_NODE_TYPE_WALK]      = "walk",           \
-    [FIB_NODE_TYPE_PATH_LIST] = "path-list",      \
-    [FIB_NODE_TYPE_PATH]      = "path",           \
-    [FIB_NODE_TYPE_MPLS_ENTRY] = "mpls-entry",    \
-    [FIB_NODE_TYPE_MPLS_TUNNEL] = "mpls-tunnel",  \
-    [FIB_NODE_TYPE_ADJ] = "adj",                  \
-    [FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY] = "lisp-gpe-fwd-entry", \
-    [FIB_NODE_TYPE_LISP_ADJ] = "lisp-adj", \
-    [FIB_NODE_TYPE_GRE_TUNNEL] = "gre-tunnel", \
-    [FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel", \
+#define FIB_NODE_TYPES {					\
+    [FIB_NODE_TYPE_ENTRY]     = "entry",			\
+    [FIB_NODE_TYPE_MFIB_ENTRY] = "mfib-entry",			\
+    [FIB_NODE_TYPE_WALK]      = "walk",				\
+    [FIB_NODE_TYPE_PATH_LIST] = "path-list",			\
+    [FIB_NODE_TYPE_PATH]      = "path",				\
+    [FIB_NODE_TYPE_MPLS_ENTRY] = "mpls-entry",			\
+    [FIB_NODE_TYPE_MPLS_TUNNEL] = "mpls-tunnel",		\
+    [FIB_NODE_TYPE_ADJ] = "adj",				\
+    [FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY] = "lisp-gpe-fwd-entry",	\
+    [FIB_NODE_TYPE_LISP_ADJ] = "lisp-adj",			\
+    [FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel",		\
+    [FIB_NODE_TYPE_MAP_E] = "map-e",				\
+    [FIB_NODE_TYPE_VXLAN_GPE_TUNNEL] = "vxlan-gpe-tunnel",	\
+    [FIB_NODE_TYPE_UDP_ENCAP] = "udp-encap",			\
+    [FIB_NODE_TYPE_BIER_FMASK] = "bier-fmask",			\
+    [FIB_NODE_TYPE_BIER_ENTRY] = "bier-entry",			\
+    [FIB_NODE_TYPE_VXLAN_GBP_TUNNEL] = "vxlan-gbp-tunnel",	\
+    [FIB_NODE_TYPE_IPSEC_SA] = "ipsec-sa",                      \
+    [FIB_NODE_TYPE_IP_PUNT_REDIRECT] = "ip-punt-redirect",      \
+    [FIB_NODE_TYPE_ENTRY_TRACK] = "fib-entry-track"             \
 }
 
 /**
@@ -101,6 +118,10 @@ typedef enum fib_node_back_walk_reason_t_ {
      * a unipath adjacency changes
      */
     FIB_NODE_BW_REASON_ADJ_UPDATE,
+    /**
+     * Walk update the adjacency MTU
+     */
+    FIB_NODE_BW_REASON_ADJ_MTU,
     /**
      * Walk to update children to inform them the adjacency is now down.
      */
@@ -118,6 +139,7 @@ typedef enum fib_node_back_walk_reason_t_ {
     [FIB_NODE_BW_REASON_INTERFACE_DOWN] = "if-down",        \
     [FIB_NODE_BW_REASON_INTERFACE_DELETE] = "if-delete",    \
     [FIB_NODE_BW_REASON_ADJ_UPDATE] = "adj-update",         \
+    [FIB_NODE_BW_REASON_ADJ_MTU] = "adj-mtu",               \
     [FIB_NODE_BW_REASON_ADJ_DOWN] = "adj-down",             \
 }
 
@@ -137,17 +159,21 @@ typedef enum fib_node_bw_reason_flag_t_ {
     FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN = (1 << FIB_NODE_BW_REASON_INTERFACE_DOWN),
     FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE = (1 << FIB_NODE_BW_REASON_INTERFACE_DELETE),
     FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE = (1 << FIB_NODE_BW_REASON_ADJ_UPDATE),
+    FIB_NODE_BW_REASON_FLAG_ADJ_MTU = (1 << FIB_NODE_BW_REASON_ADJ_MTU),
     FIB_NODE_BW_REASON_FLAG_ADJ_DOWN = (1 << FIB_NODE_BW_REASON_ADJ_DOWN),
 } __attribute__ ((packed)) fib_node_bw_reason_flag_t;
 
 STATIC_ASSERT(sizeof(fib_node_bw_reason_flag_t) < 2,
 	      "BW Reason enum < 2 byte. Consequences for cover_upd_res_t");
 
+extern u8 *format_fib_node_bw_reason(u8 *s, va_list *args);
+
 /**
  * Flags on the walk
  */
 typedef enum fib_node_bw_flags_t_
 {
+    FIB_NODE_BW_FLAG_NONE = 0,
     /**
      * Force the walk to be synchronous
      */
@@ -155,7 +181,7 @@ typedef enum fib_node_bw_flags_t_
 } fib_node_bw_flags_t;
 
 /**
- * Forward eclarations
+ * Forward declarations
  */
 struct fib_node_t_;
 
@@ -270,21 +296,18 @@ typedef struct fib_node_vft_t_ {
 /**
  * An node in the FIB graph
  *
- * Objects in the FIB form a graph. 
+ * Objects in the FIB form a graph.
  */
 typedef struct fib_node_t_ {
-#if CLIB_DEBUG > 0
     /**
      * The node's type. make sure we are dynamic/down casting correctly
      */
     fib_node_type_t fn_type;
-#endif
+
     /**
-     * The node's VFT.
-     * we could store the type here instead, and lookup the VFT using that. But
-     * I like this better,
+     * Some pad space the concrete/derived type is free to use
      */
-    const fib_node_vft_t *fn_vft;
+    u16 fn_pad;
 
     /**
      * Vector of nodes that depend upon/use/share this node
@@ -298,6 +321,8 @@ typedef struct fib_node_t_ {
     u32 fn_locks;
 } fib_node_t;
 
+STATIC_ASSERT(sizeof(fib_node_t) == 12, "FIB node type is growing");
+
 /**
  * @brief
  *  Register the function table for a given type