X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_private.h;h=1da334a1da97380b047dcda2b5c835d366530634;hb=4ac258497;hp=21853ebdc9a6ae6329f4a8e6556824738de18c2a;hpb=6a6555ac34cf1c74cb3d82ae3b77232797c73b6a;p=vpp.git diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 21853ebdc9a..1da334a1da9 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -165,7 +165,8 @@ typedef struct vcl_session_ u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) - u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG) + + transport_endpt_ext_cfg_t *ext_config; #if VCL_ELOG elog_track_t elog_track; @@ -286,11 +287,16 @@ typedef struct vcl_worker_ clib_socket_t app_api_sock; socket_client_main_t bapi_sock_ctx; api_main_t bapi_api_ctx; + memory_client_main_t bapi_mem_ctx; /* State of the connection, shared between msg RX thread and main thread */ volatile vcl_bapi_app_state_t bapi_app_state; volatile uword bapi_return; + u8 session_attr_op; + int session_attr_op_rv; + transport_endpt_attr_t session_attr_rv; + /** vcl needs next epoll_create to go to libc_epoll */ u8 vcl_needs_real_epoll; volatile int rpc_done; @@ -364,6 +370,8 @@ extern vppcom_main_t _vppcom_main; #define VCL_INVALID_SEGMENT_INDEX ((u32)~0) #define VCL_INVALID_SEGMENT_HANDLE ((u64)~0) +void vcl_session_detach_fifos (vcl_session_t *s); + static inline vcl_session_t * vcl_session_alloc (vcl_worker_t * wrk) { @@ -380,6 +388,7 @@ vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s) { /* Debug level set to 1 to avoid debug messages while ldp is cleaning up */ VDBG (1, "session %u [0x%llx] removed", s->session_index, s->vpp_handle); + vcl_session_detach_fifos (s); pool_put (wrk->sessions, s); } @@ -542,7 +551,8 @@ static inline u8 vcl_session_has_crypto (vcl_session_t *s) { return (s->session_type == VPPCOM_PROTO_TLS || - s->session_type == VPPCOM_PROTO_QUIC); + s->session_type == VPPCOM_PROTO_QUIC || + s->session_type == VPPCOM_PROTO_DTLS); } static inline u8 @@ -608,7 +618,7 @@ vcl_ip_copy_to_ep (ip46_address_t * ip, vppcom_endpt_t * ep, u8 is_ip4) static inline int vcl_proto_is_dgram (uint8_t proto) { - return proto == VPPCOM_PROTO_UDP; + return proto == VPPCOM_PROTO_UDP || proto == VPPCOM_PROTO_DTLS; } static inline u8 @@ -701,6 +711,9 @@ int vcl_segment_attach_session (uword segment_handle, uword rxf_offset, int vcl_segment_attach_mq (uword segment_handle, uword mq_offset, u32 mq_index, svm_msg_q_t **mq); int vcl_segment_discover_mqs (uword segment_handle, int *fds, u32 n_fds); +svm_fifo_chunk_t *vcl_segment_alloc_chunk (uword segment_handle, + u32 slice_index, u32 size, + uword *offset); /* * VCL Binary API