X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_private.h;h=b50bad26b9052e26effdd517558bb5551c91816b;hb=067f9544d52c95c0b60b0e8425fce1e295120180;hp=544b2880fe1d2b776e6d37722b11aff2852a16fd;hpb=cef02be220eff4aa32ec7ff56b1e0a552faa1280;p=vpp.git diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 544b2880fe1..b50bad26b90 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -57,19 +57,20 @@ typedef enum STATE_APP_ENABLED, STATE_APP_ATTACHED, STATE_APP_ADDING_WORKER, + STATE_APP_ADDING_TLS_DATA, STATE_APP_FAILED, STATE_APP_READY } app_state_t; typedef enum { - STATE_START = 0, + STATE_CLOSED = 0, STATE_CONNECT = 0x01, STATE_LISTEN = 0x02, STATE_ACCEPT = 0x04, STATE_VPP_CLOSING = 0x08, STATE_DISCONNECT = 0x10, - STATE_FAILED = 0x20, + STATE_DETACHED = 0x20, STATE_UPDATED = 0x40, STATE_LISTEN_NO_MQ = 0x80, } vcl_session_state_t; @@ -107,7 +108,6 @@ typedef struct typedef struct vcl_session_msg { - u32 next; union { session_accepted_msg_t accepted_msg; @@ -167,9 +167,13 @@ typedef struct /* Socket configuration state */ u8 is_vep; u8 is_vep_session; + /* VCL session index of the listening session (if any) */ + u32 listener_index; + /* Accepted sessions on this listener */ + int n_accepted_sessions; u8 has_rx_evt; u32 attr; - u64 transport_opts; + u64 parent_handle; vppcom_epoll_t vep; int libc_epfd; svm_msg_q_t *our_evt_q; @@ -206,6 +210,8 @@ typedef struct vppcom_cfg_t_ char *event_log_path; u8 *vpp_api_filename; u8 *vpp_api_socket_name; + u8 *vpp_api_chroot; + u32 tls_engine; } vppcom_cfg_t; void vppcom_cfg (vppcom_cfg_t * vcl_cfg); @@ -247,6 +253,9 @@ typedef struct vcl_worker_ /** VPP binary api input queue */ svm_queue_t *vl_input_queue; + /** VPP mq to be used for exchanging control messages */ + svm_msg_q_t *ctrl_mq; + /** Message queues epoll fd. Initialized only if using mqs with eventfds */ int mqs_epfd; @@ -289,6 +298,9 @@ typedef struct vcl_worker_ u32 forked_child; + socket_client_main_t bapi_sock_ctx; + memory_client_main_t bapi_shm_ctx; + api_main_t bapi_api_ctx; } vcl_worker_t; typedef struct vppcom_main_t_ @@ -325,6 +337,9 @@ typedef struct vppcom_main_t_ /** Mapped segments table */ uword *segment_table; + /** Control mq obtained from attach */ + svm_msg_q_t *ctrl_mq; + fifo_segment_main_t segment_main; #ifdef VCL_ELOG @@ -352,12 +367,14 @@ vcl_session_alloc (vcl_worker_t * wrk) pool_get (wrk->sessions, s); memset (s, 0, sizeof (*s)); s->session_index = s - wrk->sessions; + s->listener_index = VCL_INVALID_SESSION_INDEX; return s; } static inline void vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s) { + VDBG (0, "session %u [0x%llx] removed", s->session_index, s->vpp_handle); pool_put (wrk->sessions, s); } @@ -447,6 +464,26 @@ vcl_session_table_del_listener (vcl_worker_t * wrk, u64 listener_handle) hash_unset (wrk->session_index_by_vpp_handles, listener_handle); } +static inline int +vcl_session_is_connectable_listener (vcl_worker_t * wrk, + vcl_session_t * session) +{ + /* Tell if we session_handle is a QUIC session. + * We can be in the following cases : + * Listen session <- QUIC session <- Stream session + * QUIC session <- Stream session + */ + vcl_session_t *ls; + if (session->session_type != VPPCOM_PROTO_QUIC) + return 0; + if (session->listener_index == VCL_INVALID_SESSION_INDEX) + return !(session->session_state & STATE_LISTEN); + ls = vcl_session_get_w_handle (wrk, session->listener_index); + if (!ls) + return VPPCOM_EBADFD; + return ls->session_state & STATE_LISTEN; +} + static inline vcl_session_t * vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 handle) { @@ -467,7 +504,8 @@ vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 handle) return 0; } - ASSERT (session->session_state & (STATE_LISTEN | STATE_LISTEN_NO_MQ)); + ASSERT ((session->session_state & (STATE_LISTEN | STATE_LISTEN_NO_MQ)) || + vcl_session_is_connectable_listener (wrk, session)); return session; } @@ -479,6 +517,14 @@ vcl_session_is_ct (vcl_session_t * s) return (s->ct_tx_fifo != 0); } +static inline u8 +vcl_session_is_cl (vcl_session_t * s) +{ + if (s->session_type == VPPCOM_PROTO_UDP) + return 1; + return 0; +} + static inline u8 vcl_session_is_open (vcl_session_t * s) { @@ -497,6 +543,7 @@ vcl_session_is_closing (vcl_session_t * s) static inline int vcl_session_closing_error (vcl_session_t * s) { + /* Return 0 on closing sockets */ return s->session_state == STATE_DISCONNECT ? VPPCOM_ECONNRESET : 0; } @@ -521,6 +568,7 @@ vcl_worker_t *vcl_worker_alloc_and_init (void); void vcl_worker_cleanup (vcl_worker_t * wrk, u8 notify_vpp); int vcl_worker_register_with_vpp (void); int vcl_worker_set_bapi (void); +svm_msg_q_t *vcl_worker_ctrl_mq (vcl_worker_t * wrk); void vcl_flush_mq_events (void); void vcl_cleanup_bapi (void); @@ -572,14 +620,13 @@ void vcl_send_session_worker_update (vcl_worker_t * wrk, vcl_session_t * s, * VCL Binary API */ int vppcom_connect_to_vpp (char *app_name); +void vppcom_disconnect_from_vpp (void); void vppcom_init_error_string_table (void); void vppcom_send_session_enable_disable (u8 is_enable); void vppcom_app_send_attach (void); void vppcom_app_send_detach (void); -void vppcom_send_connect_sock (vcl_session_t * session); +void vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s); void vppcom_send_disconnect_session (u64 vpp_handle); -void vppcom_send_bind_sock (vcl_session_t * session); -void vppcom_send_unbind_sock (vcl_worker_t * wrk, u64 vpp_handle); void vppcom_api_hookup (void); void vppcom_send_application_tls_cert_add (vcl_session_t * session, char *cert, u32 cert_len); @@ -588,6 +635,10 @@ void vppcom_send_application_tls_key_add (vcl_session_t * session, char *key, void vcl_send_app_worker_add_del (u8 is_add); void vcl_send_child_worker_del (vcl_worker_t * wrk); +int vcl_segment_attach (u64 segment_handle, char *name, + ssvm_segment_type_t type, int fd); +void vcl_segment_detach (u64 segment_handle); + u32 vcl_max_nsid_len (void); u8 *format_api_error (u8 * s, va_list * args);