6rd: fix debug cli short-help

[vpp.git] / src / vnet / ipip / ipip.h

diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h
index 6afb188..7eecebb 100644 (file)
--- a/src/vnet/ipip/ipip.h
+++ b/src/vnet/ipip/ipip.h
@@ -26,11 +26,12 @@
 
 extern vnet_hw_interface_class_t ipip_hw_interface_class;
 
-#define foreach_ipip_error                     \
-  /* Must be first. */                         \
-  _(DECAP_PKTS, "packets decapsulated")                \
-  _(BAD_PROTOCOL, "bad protocol")              \
-  _(NO_TUNNEL, "no tunnel")
+#define foreach_ipip_error                             \
+  /* Must be first. */                                 \
+  _(DECAP_PKTS, "packets decapsulated")                        \
+  _(BAD_PROTOCOL, "bad protocol")                      \
+  _(NO_TUNNEL, "no tunnel")                            \
+  _(FRAGMENTED_PACKET, "fragmented outer packet")
 
 typedef enum
 {
@@ -51,10 +52,10 @@ typedef enum
 
 typedef struct
 {
-  ipip_transport_t transport;
-  u32 fib_index;
   ip46_address_t src;
   ip46_address_t dst;
+  ipip_transport_t transport;
+  u32 fib_index;
 } __attribute__ ((packed)) ipip_tunnel_key_t;
 
 typedef enum
@@ -83,24 +84,16 @@ typedef struct
   u32 user_instance;           /* Instance name being shown to user */
   u8 tc_tos;
 
-  union
+  struct
   {
-    struct
-    {
-      fib_node_t node;
-      fib_node_index_t fib_entry_index;
-      u32 sibling_index;
-    } p2p;
-    struct
-    {
-      ip6_address_t ip6_prefix;
-      ip4_address_t ip4_prefix;
-      u8 ip6_prefix_len;
-      u8 ip4_prefix_len;
-      u8 shift;
-      bool security_check;
-    } sixrd;
-  };
+    ip6_address_t ip6_prefix;
+    ip4_address_t ip4_prefix;
+    u8 ip6_prefix_len;
+    u8 ip4_prefix_len;
+    u8 shift;
+    bool security_check;
+    u32 ip6_fib_index;
+  } sixrd;
 } ipip_tunnel_t;
 
 typedef struct
@@ -108,7 +101,6 @@ typedef struct
   ipip_tunnel_t *tunnels;
   uword *tunnel_by_key;
   u32 *tunnel_index_by_sw_if_index;
-  fib_node_type_t fib_node_type;
 
   /* convenience */
   vlib_main_t *vlib_main;
@@ -154,7 +146,8 @@ int ipip_del_tunnel (u32 sw_if_index);
 int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
                      ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
                      ip4_address_t * ip4_src, bool security_check,
-                     u32 fib_index, u32 * sw_if_index);
+                     u32 ip4_fib_index, u32 ip6_fib_index,
+                     u32 * sw_if_index);
 int sixrd_del_tunnel (u32 sw_if_index);
 void ipip_tunnel_db_add (ipip_tunnel_t * t, ipip_tunnel_key_t * key);
 void ipip_tunnel_db_remove (ipip_tunnel_t * t);