ikev2: fix tunnel direction

[vpp.git] / src / vnet / gso / hdr_offset_parser.h

diff --git a/src/vnet/gso/hdr_offset_parser.h b/src/vnet/gso/hdr_offset_parser.h
index b194333..999a278 100644 (file)
--- a/src/vnet/gso/hdr_offset_parser.h
+++ b/src/vnet/gso/hdr_offset_parser.h
@@ -19,8 +19,9 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_packet.h>
+#include <vnet/tcp/tcp_packet.h>
 #include <vnet/vnet.h>
 #include <vnet/vxlan/vxlan_packet.h>
 
@@ -82,7 +83,6 @@ format_generic_header_offset (u8 * s, va_list * args)
 {
   generic_header_offset_t *gho = va_arg (*args, generic_header_offset_t *);
 
-  s = format (s, "\n\t");
   if (gho->gho_flags & GHO_F_TUNNEL)
     {
       if (gho->gho_flags & GHO_F_VXLAN_TUNNEL)
@@ -156,8 +156,6 @@ vnet_geneve_inner_header_parser_inline (vlib_buffer_t * b0,
   /* not supported yet */
   if ((gho->gho_flags & GHO_F_GENEVE_TUNNEL) == 0)
     return;
-
-  ASSERT (0);
 }
 
 static_always_inline void
@@ -167,8 +165,6 @@ vnet_gre_inner_header_parser_inline (vlib_buffer_t * b0,
   /* not supported yet */
   if ((gho->gho_flags & GHO_F_GRE_TUNNEL) == 0)
     return;
-
-  ASSERT (0);
 }
 
 static_always_inline void
@@ -376,7 +372,7 @@ vnet_generic_outer_header_parser_inline (vlib_buffer_t * b0,
   u16 ethertype = 0;
   u16 l2hdr_sz = 0;
 
-  ASSERT (is_ip4 ^ is_ip6);
+  ASSERT (!(is_ip4 && is_ip6));
 
   if (is_l2)
     {