#ifndef SRC_VNET_SESSION_STREAM_SESSION_H_
#define SRC_VNET_SESSION_STREAM_SESSION_H_
-#include <vnet/vnet.h>
#include <svm/svm_fifo.h>
#include <vnet/session/transport.h>
SESSION_STATE_CONNECTING,
SESSION_STATE_ACCEPTING,
SESSION_STATE_READY,
- SESSION_STATE_CONNECTING_READY,
+ SESSION_STATE_OPENED,
+ SESSION_STATE_TRANSPORT_CLOSING,
+ SESSION_STATE_CLOSING,
SESSION_STATE_CLOSED,
SESSION_STATE_N_STATES,
} stream_session_state_t;
-/* TODO convert to macro once cleanup completed */
-typedef struct app_session_
+typedef struct generic_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;
+ svm_fifo_t *rx_fifo; /**< rx fifo */
+ svm_fifo_t *tx_fifo; /**< tx fifo */
+ session_type_t session_type; /**< session type */
+ volatile u8 session_state; /**< session state */
+ u32 session_index; /**< index in owning pool */
+} generic_session_t;
typedef struct _stream_session_t
{
/** Session index in per_thread pool */
u32 session_index;
- /** stream server pool index */
- u32 app_index;
+ /** App worker pool index */
+ u32 app_wrk_index;
u8 thread_index;
/** To avoid n**2 "one event per frame" check */
- u8 enqueue_epoch;
+ u64 enqueue_epoch;
/** svm segment index where fifos were allocated */
u32 svm_segment_index;
{
/** Parent listener session if the result of an accept */
u32 listener_index;
+
+ /** Application index if a listener */
+ u32 app_index;
+ };
+
+ union
+ {
+ /** Transport app index for apps acting as transports */
+ u32 t_app_index;
+
+ /** Index in listener app's listener db */
+ u32 listener_db_index;
+
/** Opaque, for general use */
u32 opaque;
};
u32 session_index;
/** Server index */
- u32 app_index;
+ u32 app_wrk_index;
+
+ /** Port for connection. Overlaps thread_index/enqueue_epoch */
+ u16 port;
+
+ /** Partly overlaps enqueue_epoch */
+ u8 pad_epoch[7];
/** Segment index where fifos were allocated */
u32 svm_segment_index;
- u32 listener_index;
+ /** Transport listener index. Overlaps connection index */
+ u32 transport_listener_index;
- /** Port for connection */
- u16 port;
+ union
+ {
+ u32 listener_index;
+ u32 app_index;
+ };
+
+ u32 listener_db_index;
/** Has transport embedded when listener not purely local */
session_type_t listener_session_type;
- u32 transport_listener_index;
/**
* Client data
*/
- u32 client_index;
+ u32 client_wrk_index;
u32 client_opaque;
u64 server_evt_q;
} 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
{
#undef _
} session_endpoint_t;
-typedef struct _session_endpoint_extended
+typedef struct _session_endpoint_cfg
{
#define _(type, name) type name;
foreach_session_endpoint_fields
#undef _
- u32 app_index;
+ u32 app_wrk_index;
u32 opaque;
u8 *hostname;
-} session_endpoint_extended_t;
+} session_endpoint_cfg_t;
+
+#define SESSION_IP46_ZERO \
+{ \
+ .ip6 = { \
+ { 0, 0, }, \
+ }, \
+}
-#define SESSION_IP46_ZERO \
-{ \
- .ip6 = { \
- { 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 \
-{ \
+#define SESSION_ENDPOINT_NULL \
+{ \
.sw_if_index = ENDPOINT_INVALID_INDEX, \
- .ip = SESSION_IP46_ZERO, \
- .fib_index = ENDPOINT_INVALID_INDEX, \
- .is_ip4 = 0, \
- .port = 0, \
- .transport_proto = 0, \
+ .ip = SESSION_IP46_ZERO, \
+ .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, \
- .transport_proto = 0, \
- .app_index = ENDPOINT_INVALID_INDEX, \
- .opaque = 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, \
.hostname = 0, \
}
#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)