ipsec: remove dedicated IPSec tunnels

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

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 97dd31c..aed72c5 100644 (file)
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -185,13 +185,41 @@ typedef struct
        /* reassembly */
        union
        {
-         /* in/out variables */
+         /* group input/output/handoff to simplify the code, this way:
+          * we can handoff while keeping input variables intact
+          * and also we can write the output and still use next_index later */
          struct
          {
-           u32 next_index;     /* index of next node - used by custom apps */
-           u32 error_next_index;       /* index of next node if error - used by custom apps */
-           u16 estimated_mtu;  /* estimated MTU calculated during reassembly */
-           u16 owner_thread_index;
+           /* input variables */
+           struct
+           {
+             u32 next_index;   /* index of next node - used by custom apps */
+             u32 error_next_index;     /* index of next node if error - used by custom apps */
+           };
+           /* handoff variables */
+           struct
+           {
+             u16 owner_thread_index;
+           };
+           /* output variables */
+           struct
+           {
+             union
+             {
+               /* shallow virtual reassembly output variables */
+               struct
+               {
+                 u8 ip_proto;  /* protocol in ip header */
+                 u16 l4_src_port;      /* tcp/udp/icmp src port */
+                 u16 l4_dst_port;      /* tcp/udp/icmp dst port */
+               };
+               /* full reassembly output variables */
+               struct
+               {
+                 u16 estimated_mtu;    /* estimated MTU calculated during reassembly */
+               };
+             };
+           };
          };
          /* internal variables used during reassembly */
          struct
@@ -202,11 +230,9 @@ typedef struct
            u16 range_last;
            u32 next_range_bi;
            u16 ip6_frag_hdr_offset;
-           u16 owner_feature_thread_index;
          };
        } reass;
       };
-
     } ip;
 
     /*
@@ -221,8 +247,12 @@ typedef struct
       u8 ttl;
       u8 exp;
       u8 first;
+      u8 pyld_proto:3;         /* dpo_proto_t */
+      u8 rsvd:5;
       /* Rewrite length */
       u32 save_rewrite_length;
+      /* Save the mpls header length including all label stack */
+      u8 mpls_hdr_length;
       /*
        * BIER - the number of bytes in the header.
        *  the len field in the header is not authoritative. It's the
@@ -427,7 +457,10 @@ STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
               STRUCT_SIZE_OF (vlib_buffer_t, opaque2),
               "VNET buffer opaque2 meta-data too large for vlib_buffer");
 
-#define gso_mtu_sz(b) (vnet_buffer2(b)->gso_size + vnet_buffer2(b)->gso_l4_hdr_sz + vnet_buffer(b)->l4_hdr_offset)
+#define gso_mtu_sz(b) (vnet_buffer2(b)->gso_size + \
+                       vnet_buffer2(b)->gso_l4_hdr_sz + \
+                       vnet_buffer(b)->l4_hdr_offset - \
+                       vnet_buffer (b)->l3_hdr_offset)
 
 
 format_function_t format_vnet_buffer;