X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fstream_session.h;h=57d256cdbc609f3f5f663b3e02b855dad33c10ed;hb=f8f516a8b0ccab2f5d9796f90419bf2661c750af;hp=1ed6e0b9eec09ff6732ba30f20a622b398fdc40f;hpb=cea194d8f973a2f2b5ef72d212533057174cc70a;p=vpp.git

diff --git a/src/vnet/session/stream_session.h b/src/vnet/session/stream_session.h
index 1ed6e0b9eec..57d256cdbc6 100644
--- a/src/vnet/session/stream_session.h
+++ b/src/vnet/session/stream_session.h
@@ -20,19 +20,7 @@
 #include <svm/svm_fifo.h>
 #include <vnet/session/transport.h>
 
-#define foreach_session_type                    \
-  _(IP4_TCP, ip4_tcp)                           \
-  _(IP4_UDP, ip4_udp)                           \
-  _(IP6_TCP, ip6_tcp)                           \
-  _(IP6_UDP, ip6_udp)
-
-typedef enum
-{
-#define _(A, a) SESSION_TYPE_##A,
-  foreach_session_type
-#undef _
-    SESSION_N_TYPES,
-} session_type_t;
+typedef u8 session_type_t;
 
 /*
  * Application session state
@@ -43,10 +31,31 @@ typedef enum
   SESSION_STATE_CONNECTING,
   SESSION_STATE_ACCEPTING,
   SESSION_STATE_READY,
+  SESSION_STATE_CONNECTING_READY,
   SESSION_STATE_CLOSED,
   SESSION_STATE_N_STATES,
 } stream_session_state_t;
 
+/* TODO convert to macro once cleanup completed */
+typedef struct app_session_
+{
+  /** fifo pointers. Once allocated, these do not move */
+  svm_fifo_t *server_rx_fifo;
+  svm_fifo_t *server_tx_fifo;
+
+  /** Type */
+  session_type_t session_type;
+
+  /** State */
+  volatile u8 session_state;
+
+  /** Session index in owning pool */
+  u32 session_index;
+
+  /** Application index */
+  u32 app_index;
+} app_session_t;
+
 typedef struct _stream_session_t
 {
   /** fifo pointers. Once allocated, these do not move */
@@ -54,11 +63,17 @@ typedef struct _stream_session_t
   svm_fifo_t *server_tx_fifo;
 
   /** Type */
-  u8 session_type;
+  session_type_t session_type;
 
   /** State */
   volatile u8 session_state;
 
+  /** Session index in per_thread pool */
+  u32 session_index;
+
+  /** stream server pool index */
+  u32 app_index;
+
   u8 thread_index;
 
   /** To avoid n**2 "one event per frame" check */
@@ -67,21 +82,56 @@ typedef struct _stream_session_t
   /** svm segment index where fifos were allocated */
   u32 svm_segment_index;
 
-  /** Session index in per_thread pool */
-  u32 session_index;
-
   /** Transport specific */
   u32 connection_index;
 
-  /** stream server pool index */
-  u32 app_index;
-
   /** Parent listener session if the result of an accept */
   u32 listener_index;
 
     CLIB_CACHE_LINE_ALIGN_MARK (pad);
 } stream_session_t;
 
+typedef struct local_session_
+{
+  /** fifo pointers. Once allocated, these do not move */
+  svm_fifo_t *server_rx_fifo;
+  svm_fifo_t *server_tx_fifo;
+
+  /** Type */
+  session_type_t session_type;
+
+  /** State */
+  volatile u8 session_state;
+
+  /** Session index */
+  u32 session_index;
+
+  /** Server index */
+  u32 app_index;
+
+  /** Segment index where fifos were allocated */
+  u32 svm_segment_index;
+
+  u32 listener_index;
+
+  /** Port for connection */
+  u16 port;
+
+  /** Has transport embedded when listener not purely local */
+  session_type_t listener_session_type;
+
+  /**
+   * Client data
+   */
+  u32 client_index;
+  u32 client_opaque;
+
+  u64 server_evt_q;
+  u64 client_evt_q;
+
+    CLIB_CACHE_LINE_ALIGN_MARK (pad);
+} local_session_t;
+
 typedef struct _session_endpoint
 {
   /*