Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session/tcp: support tx flush mark
[vpp.git]
/
src
/
vnet
/
session
/
stream_session.h
diff --git
a/src/vnet/session/stream_session.h
b/src/vnet/session/stream_session.h
index
567962a
..
c335c5b
100644
(file)
--- a/
src/vnet/session/stream_session.h
+++ b/
src/vnet/session/stream_session.h
@@
-31,6
+31,7
@@
typedef enum
SESSION_STATE_ACCEPTING,
SESSION_STATE_READY,
SESSION_STATE_OPENED,
SESSION_STATE_ACCEPTING,
SESSION_STATE_READY,
SESSION_STATE_OPENED,
+ SESSION_STATE_TRANSPORT_CLOSING,
SESSION_STATE_CLOSING,
SESSION_STATE_CLOSED,
SESSION_STATE_N_STATES,
SESSION_STATE_CLOSING,
SESSION_STATE_CLOSED,
SESSION_STATE_N_STATES,
@@
-60,13
+61,13
@@
typedef struct _stream_session_t
/** Session index in per_thread pool */
u32 session_index;
/** Session index in per_thread pool */
u32 session_index;
- /**
a
pp worker pool index */
+ /**
A
pp worker pool index */
u32 app_wrk_index;
u8 thread_index;
/** To avoid n**2 "one event per frame" check */
u32 app_wrk_index;
u8 thread_index;
/** To avoid n**2 "one event per frame" check */
- u
8
enqueue_epoch;
+ u
64
enqueue_epoch;
/** svm segment index where fifos were allocated */
u32 svm_segment_index;
/** svm segment index where fifos were allocated */
u32 svm_segment_index;
@@
-78,6
+79,19
@@
typedef struct _stream_session_t
{
/** Parent listener session if the result of an accept */
u32 listener_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;
};
/** Opaque, for general use */
u32 opaque;
};
@@
-103,17
+117,28
@@
typedef struct local_session_
/** Server index */
u32 app_wrk_index;
/** Server 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;
/** 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;
/** Has transport embedded when listener not purely local */
session_type_t listener_session_type;
- u32 transport_listener_index;
/**
* Client data
/**
* Client data
@@
-128,8
+153,8
@@
typedef struct local_session_
} local_session_t;
#define foreach_session_endpoint_fields \
} 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
{
typedef struct _session_endpoint
{
@@
-138,7
+163,7
@@
typedef struct _session_endpoint
#undef _
} session_endpoint_t;
#undef _
} session_endpoint_t;
-typedef struct _session_endpoint_
extended
+typedef struct _session_endpoint_
cfg
{
#define _(type, name) type name;
foreach_session_endpoint_fields
{
#define _(type, name) type name;
foreach_session_endpoint_fields
@@
-146,7
+171,7
@@
typedef struct _session_endpoint_extended
u32 app_wrk_index;
u32 opaque;
u8 *hostname;
u32 app_wrk_index;
u32 opaque;
u8 *hostname;
-} session_endpoint_
extended
_t;
+} session_endpoint_
cfg
_t;
#define SESSION_IP46_ZERO \
{ \
#define SESSION_IP46_ZERO \
{ \
@@
-154,6
+179,15
@@
typedef struct _session_endpoint_extended
{ 0, 0, }, \
}, \
}
{ 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, \
#define SESSION_ENDPOINT_NULL \
{ \
.sw_if_index = ENDPOINT_INVALID_INDEX, \
@@
-161,15
+195,17
@@
typedef struct _session_endpoint_extended
.fib_index = ENDPOINT_INVALID_INDEX, \
.is_ip4 = 0, \
.port = 0, \
.fib_index = ENDPOINT_INVALID_INDEX, \
.is_ip4 = 0, \
.port = 0, \
+ .peer = TRANSPORT_ENDPOINT_NULL, \
.transport_proto = 0, \
}
.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, \
{ \
.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, \
.transport_proto = 0, \
.app_wrk_index = ENDPOINT_INVALID_INDEX, \
.opaque = ENDPOINT_INVALID_INDEX, \
@@
-177,6
+213,8
@@
typedef struct _session_endpoint_extended
}
#define session_endpoint_to_transport(_sep) ((transport_endpoint_t *)_sep)
}
#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)
always_inline u8
session_endpoint_fib_proto (session_endpoint_t * sep)