X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipip%2Fipip.h;h=93930aa33370e742b145f5c43ede482dc71fbaf3;hb=1ba5bc8d8;hp=e9277d8a0618c583e57985ceabd1e2e44194cc64;hpb=298c69510ff4b64a262d465eb8877c4e7f4e60e0;p=vpp.git

diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h
index e9277d8a061..93930aa3337 100644
--- 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
@@ -68,6 +69,9 @@ typedef enum
  */
 typedef struct
 {
+  /* Required for pool_get_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
   ipip_mode_t mode;
   ipip_transport_t transport;
   ipip_tunnel_key_t *key;
@@ -78,6 +82,7 @@ typedef struct
   u32 sw_if_index;
   u32 dev_instance;		/* Real device instance in tunnel vector */
   u32 user_instance;		/* Instance name being shown to user */
+  u8 tc_tos;
 
   union
   {
@@ -95,6 +100,7 @@ typedef struct
       u8 ip4_prefix_len;
       u8 shift;
       bool security_check;
+      u32 ip6_fib_index;
     } sixrd;
   };
 } ipip_tunnel_t;
@@ -145,12 +151,13 @@ sixrd_get_addr_net (const ipip_tunnel_t * t, u64 dal)
 
 int ipip_add_tunnel (ipip_transport_t transport, u32 instance,
 		     ip46_address_t * src, ip46_address_t * dst,
-		     u32 fib_index, u32 * sw_if_indexp);
+		     u32 fib_index, u8 tc_tos, u32 * sw_if_indexp);
 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);