VPP-659 TCP improvements

[vpp.git] / src / vnet / session / transport.h

diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h
index 2d4415b..0da3026 100644 (file)
--- a/src/vnet/session/transport.h
+++ b/src/vnet/session/transport.h
@@ -74,7 +74,7 @@ typedef struct _transport_proto_vft
     u32 (*push_header) (transport_connection_t * tconn, vlib_buffer_t * b);
     u16 (*send_mss) (transport_connection_t * tc);
     u32 (*send_space) (transport_connection_t * tc);
-    u32 (*rx_fifo_offset) (transport_connection_t * tc);
+    u32 (*tx_fifo_offset) (transport_connection_t * tc);
 
   /*
    * Connection retrieval
@@ -92,39 +92,39 @@ typedef struct _transport_proto_vft
 
 } transport_proto_vft_t;
 
+/* *INDENT-OFF* */
 /* 16 octets */
-typedef CLIB_PACKED (struct
-                    {
-                    union
-                    {
-                    struct
-                    {
-                    ip4_address_t src; ip4_address_t dst;
-                    u16 src_port;
-                    u16 dst_port;
-                    /* align by making this 4 octets even though its a 1-bit field
-                     * NOTE: avoid key overlap with other transports that use 5 tuples for
-                     * session identification.
-                     */
-                    u32 proto;
-                    };
-                    u64 as_u64[2];
-                    };
-                    }) v4_connection_key_t;
-
-typedef CLIB_PACKED (struct
-                    {
-                    union
-                    {
-                    struct
-                    {
-                    /* 48 octets */
-                    ip6_address_t src; ip6_address_t dst;
-                    u16 src_port;
-                    u16 dst_port; u32 proto; u8 unused_for_now[8];
-                    }; u64 as_u64[6];
-                    };
-                    }) v6_connection_key_t;
+typedef CLIB_PACKED (struct {
+  union
+    {
+      struct
+       {
+         ip4_address_t src; ip4_address_t dst;
+         u16 src_port;
+         u16 dst_port;
+         /* align by making this 4 octets even though its a 1-bit field
+          * NOTE: avoid key overlap with other transports that use 5 tuples for
+          * session identification.
+          */
+         u32 proto;
+       };
+      u64 as_u64[2];
+    };
+}) v4_connection_key_t;
+
+typedef CLIB_PACKED (struct {
+  union
+    {
+      struct
+       {
+         /* 48 octets */
+         ip6_address_t src; ip6_address_t dst;
+         u16 src_port;
+         u16 dst_port; u32 proto; u8 unused_for_now[8];
+       }; u64 as_u64[6];
+    };
+}) v6_connection_key_t;
+/* *INDENT-ON* */
 
 typedef clib_bihash_kv_16_8_t session_kv4_t;
 typedef clib_bihash_kv_48_8_t session_kv6_t;
@@ -189,6 +189,10 @@ make_v6_ss_kv (session_kv6_t * kv, ip6_address_t * lcl, ip6_address_t * rmt,
 
   kv->key[0] = key.as_u64[0];
   kv->key[1] = key.as_u64[1];
+  kv->key[2] = 0;
+  kv->key[3] = 0;
+  kv->key[4] = 0;
+  kv->key[5] = 0;
   kv->value = ~0ULL;
 }
 
@@ -209,6 +213,10 @@ make_v6_listener_kv (session_kv6_t * kv, ip6_address_t * lcl, u16 lcl_port,
 
   kv->key[0] = key.as_u64[0];
   kv->key[1] = key.as_u64[1];
+  kv->key[2] = 0;
+  kv->key[3] = 0;
+  kv->key[4] = 0;
+  kv->key[5] = 0;
   kv->value = ~0ULL;
 }