X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fstream_session.h;h=63adc2b909bb704ffa245a147dec583110e3a5a9;hb=5a2ec8fc41d14ffc5275ab88761c1fb7e0420a33;hp=287a8927339aaf8b1a0660c7f6ebf3de8f2e5f3a;hpb=eb97e5f548b009ffa92efa3f778b4a7f6f40b7eb;p=vpp.git

diff --git a/src/vnet/session/stream_session.h b/src/vnet/session/stream_session.h
index 287a8927339..63adc2b909b 100644
--- a/src/vnet/session/stream_session.h
+++ b/src/vnet/session/stream_session.h
@@ -33,6 +33,8 @@ typedef enum
   SESSION_STATE_OPENED,
   SESSION_STATE_TRANSPORT_CLOSING,
   SESSION_STATE_CLOSING,
+  SESSION_STATE_CLOSED_WAITING,
+  SESSION_STATE_TRANSPORT_CLOSED,
   SESSION_STATE_CLOSED,
   SESSION_STATE_N_STATES,
 } stream_session_state_t;
@@ -153,8 +155,8 @@ typedef struct local_session_
 } local_session_t;
 
 #define foreach_session_endpoint_fields				\
-    foreach_transport_connection_fields				\
-    _(u8, transport_proto)					\
+  foreach_transport_endpoint_cfg_fields				\
+  _(u8, transport_proto)					\
 
 typedef struct _session_endpoint
 {
@@ -163,7 +165,7 @@ typedef struct _session_endpoint
 #undef _
 } session_endpoint_t;
 
-typedef struct _session_endpoint_extended
+typedef struct _session_endpoint_cfg
 {
 #define _(type, name) type name;
   foreach_session_endpoint_fields
@@ -171,7 +173,7 @@ typedef struct _session_endpoint_extended
   u32 app_wrk_index;
   u32 opaque;
   u8 *hostname;
-} session_endpoint_extended_t;
+} session_endpoint_cfg_t;
 
 #define SESSION_IP46_ZERO			\
 {						\
@@ -179,6 +181,15 @@ typedef struct _session_endpoint_extended
 	{ 0, 0, },				\
     },						\
 }
+
+#define TRANSPORT_ENDPOINT_NULL			\
+{						\
+  .sw_if_index = ENDPOINT_INVALID_INDEX,	\
+  .ip = SESSION_IP46_ZERO,			\
+  .fib_index = ENDPOINT_INVALID_INDEX,		\
+  .is_ip4 = 0,					\
+  .port = 0,					\
+}
 #define SESSION_ENDPOINT_NULL 			\
 {						\
   .sw_if_index = ENDPOINT_INVALID_INDEX,	\
@@ -186,15 +197,17 @@ typedef struct _session_endpoint_extended
   .fib_index = ENDPOINT_INVALID_INDEX,		\
   .is_ip4 = 0,					\
   .port = 0,					\
+  .peer = TRANSPORT_ENDPOINT_NULL,		\
   .transport_proto = 0,				\
 }
-#define SESSION_ENDPOINT_EXT_NULL 		\
+#define SESSION_ENDPOINT_CFG_NULL 		\
 {						\
   .sw_if_index = ENDPOINT_INVALID_INDEX,	\
   .ip = SESSION_IP46_ZERO,			\
   .fib_index = ENDPOINT_INVALID_INDEX,		\
   .is_ip4 = 0,					\
   .port = 0,					\
+  .peer = TRANSPORT_ENDPOINT_NULL,		\
   .transport_proto = 0,				\
   .app_wrk_index = ENDPOINT_INVALID_INDEX,	\
   .opaque = ENDPOINT_INVALID_INDEX,		\
@@ -202,6 +215,8 @@ typedef struct _session_endpoint_extended
 }
 
 #define session_endpoint_to_transport(_sep) ((transport_endpoint_t *)_sep)
+#define session_endpoint_to_transport_cfg(_sep)		\
+  ((transport_endpoint_cfg_t *)_sep)
 
 always_inline u8
 session_endpoint_fib_proto (session_endpoint_t * sep)