X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.h;h=377ea1ef4ac26f2ab6c5f939cf1056cf36bb617c;hb=d50ff7fba167035b10def282b5ec166fa7899948;hp=f0c0a0d24033fd401349a06db7b0584f867e020b;hpb=4edc37eb90a74bcd1aad20d6447159c05853d23e;p=vpp.git diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h index f0c0a0d2403..377ea1ef4ac 100644 --- a/src/vnet/session/application.h +++ b/src/vnet/session/application.h @@ -16,9 +16,10 @@ #ifndef SRC_VNET_SESSION_APPLICATION_H_ #define SRC_VNET_SESSION_APPLICATION_H_ -#include -#include +#include #include +#include +#include #define APP_DEBUG 0 @@ -28,35 +29,6 @@ #define APP_DBG(_fmt, _args...) #endif -typedef struct _stream_session_cb_vft -{ - /** Notify server of new segment */ - int (*add_segment_callback) (u32 api_client_index, u64 segment_handle); - - /** Notify server of new segment */ - int (*del_segment_callback) (u32 api_client_index, u64 segment_handle); - - /** Notify server of newly accepted session */ - int (*session_accept_callback) (session_t * new_session); - - /** Connection request callback */ - int (*session_connected_callback) (u32 app_wrk_index, u32 opaque, - session_t * s, u8 code); - - /** Notify app that session is closing */ - void (*session_disconnect_callback) (session_t * s); - - /** Notify app that session was reset */ - void (*session_reset_callback) (session_t * s); - - /** Direct RX callback for built-in application */ - int (*builtin_app_rx_callback) (session_t * session); - - /** Direct TX callback for built-in application */ - int (*builtin_app_tx_callback) (session_t * session); - -} session_cb_vft_t; - typedef struct app_worker_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -87,23 +59,13 @@ typedef struct app_worker_ u32 first_segment_manager; u8 first_segment_manager_in_use; - /* - * Local "cut through" connections specific - */ - - /** Segment manager used for incoming "cut through" connects */ - u32 local_segment_manager; - - /** Pool of local sessions the app owns (as a server) */ - local_session_t *local_sessions; - - /** Hash table of the app's local connects */ - uword *local_connects; - /** API index for the worker. Needed for multi-process apps */ u32 api_client_index; u8 app_is_builtin; + + /** Per transport proto hash tables of half-open connection handles */ + uword **half_open_table; } app_worker_t; typedef struct app_worker_map_ @@ -115,7 +77,13 @@ typedef struct app_listener_ { clib_bitmap_t *workers; /**< workers accepting connections */ u32 accept_rotor; /**< last worker to accept a connection */ - u32 al_index; + u32 al_index; /**< app listener index in app pool */ + u32 app_index; /**< owning app index */ + u32 local_index; /**< local listening session index */ + u32 session_index; /**< global listening session index */ + session_handle_t ls_handle; /**< session handle of the local or global + listening session that also identifies + the app listener */ } app_listener_t; typedef struct application_ @@ -130,7 +98,7 @@ typedef struct application_ session_cb_vft_t cb_fns; /** Segment manager properties. Shared by all segment managers */ - segment_manager_properties_t sm_properties; + segment_manager_props_t sm_properties; /** Pool of mappings that keep track of workers associated to this app */ app_worker_map_t *worker_maps; @@ -146,25 +114,13 @@ typedef struct application_ /** Pool of listeners for the app */ app_listener_t *listeners; - /** Pool of local listeners for app */ - app_listener_t *local_listeners; - - /** Pool of local listen sessions */ - local_session_t *local_listen_sessions; - - /* - * TLS Specific - */ - - /** Certificate to be used for listen sessions */ - u8 *tls_cert; - - /** PEM encoded key */ - u8 *tls_key; - /** Preferred tls engine */ u8 tls_engine; + /** quic initialization vector */ + char quic_iv[17]; + u8 quic_iv_set; + } application_t; typedef struct app_main_ @@ -183,15 +139,17 @@ typedef struct app_main_ * Hash table of builtin apps by name */ uword *app_by_name; -} app_main_t; -#define foreach_app_init_args \ - _(u32, api_client_index) \ - _(u8 *, name) \ - _(u64 *, options) \ - _(u8 *, namespace_id) \ - _(session_cb_vft_t *, session_cb_vft) \ - _(u32, app_index) \ + /** + * Pool from which we allocate certificates (key, cert) + */ + app_cert_key_pair_t *cert_key_pair_store; + + /* + * Last registered crypto engine type + */ + crypto_engine_type_t last_crypto_engine; +} app_main_t; typedef struct app_init_args_ { @@ -215,23 +173,48 @@ typedef struct _vnet_app_worker_add_del_args #define APP_NS_INVALID_INDEX ((u32)~0) #define APP_INVALID_SEGMENT_MANAGER_INDEX ((u32) ~0) -application_t *application_alloc (void); -int application_alloc_and_init (app_init_args_t * args); -void application_free (application_t * app); -void application_detach_process (application_t * app, u32 api_client_index); +app_listener_t *app_listener_get (application_t * app, u32 al_index); +int app_listener_alloc_and_init (application_t * app, + session_endpoint_cfg_t * sep, + app_listener_t ** listener); +void app_listener_cleanup (app_listener_t * app_listener); +session_handle_t app_listener_handle (app_listener_t * app_listener); +app_listener_t *app_listener_lookup (application_t * app, + session_endpoint_cfg_t * sep); + +/** + * Get app listener handle for listening session + * + * For a given listening session, this can return either the session + * handle of the app listener associated to the listening session or, + * if no such app listener exists, the session's handle + * + * @param ls listening session + * @return app listener or listening session handle + */ +session_handle_t app_listen_session_handle (session_t * ls); +/** + * Get app listener for listener session handle + * + * Should only be called on handles that have an app listener, i.e., + * were obtained at the end of a @ref vnet_listen call. + * + * @param handle handle of the app listener. This is the handle of + * either the global or local listener + * @return pointer to app listener or 0 + */ +app_listener_t *app_listener_get_w_handle (session_handle_t handle); +app_listener_t *app_listener_get_w_session (session_t * ls); +session_t *app_listener_get_session (app_listener_t * al); +session_t *app_listener_get_local_session (app_listener_t * al); + application_t *application_get (u32 index); application_t *application_get_if_valid (u32 index); application_t *application_lookup (u32 api_client_index); application_t *application_lookup_name (const u8 * name); app_worker_t *application_get_worker (application_t * app, u32 wrk_index); app_worker_t *application_get_default_worker (application_t * app); -app_worker_t *application_listener_select_worker (session_t * ls, - u8 is_local); -int application_start_listen (application_t * app, - session_endpoint_cfg_t * tep, - session_handle_t * handle); -int application_stop_listen (u32 app_index, u32 app_or_wrk, - session_handle_t handle); +app_worker_t *application_listener_select_worker (session_t * ls); int application_change_listener_owner (session_t * s, app_worker_t * app_wrk); int application_is_proxy (application_t * app); int application_is_builtin (application_t * app); @@ -241,14 +224,13 @@ u32 application_local_session_table (application_t * app); const u8 *application_name_from_index (u32 app_or_wrk); u8 application_has_local_scope (application_t * app); u8 application_has_global_scope (application_t * app); -u8 application_use_mq_for_ctrl (application_t * app); void application_setup_proxy (application_t * app); void application_remove_proxy (application_t * app); -segment_manager_properties_t *application_get_segment_manager_properties (u32 - app_index); +segment_manager_props_t *application_get_segment_manager_properties (u32 + app_index); -segment_manager_properties_t +segment_manager_props_t * application_segment_manager_properties (application_t * app); /* @@ -263,21 +245,48 @@ app_worker_t *app_worker_get_if_valid (u32 wrk_index); application_t *app_worker_get_app (u32 wrk_index); int app_worker_own_session (app_worker_t * app_wrk, session_t * s); void app_worker_free (app_worker_t * app_wrk); -int app_worker_open_session (app_worker_t * app, session_endpoint_t * tep, - u32 api_context); -int app_worker_start_listen (app_worker_t * app_wrk, session_t * ls); -int app_worker_stop_listen (app_worker_t * app_wrk, session_handle_t handle); +int app_worker_connect_session (app_worker_t * app, session_endpoint_t * tep, + u32 api_context); +int app_worker_start_listen (app_worker_t * app_wrk, app_listener_t * lstnr); +int app_worker_stop_listen (app_worker_t * app_wrk, app_listener_t * al); +int app_worker_init_accepted (session_t * s); +int app_worker_accept_notify (app_worker_t * app_wrk, session_t * s); +int app_worker_init_connected (app_worker_t * app_wrk, session_t * s); +int app_worker_connect_notify (app_worker_t * app_wrk, session_t * s, + session_error_t err, u32 opaque); +int app_worker_add_half_open (app_worker_t * app_wrk, transport_proto_t tp, + session_handle_t ho_handle, + session_handle_t wrk_handle); +int app_worker_del_half_open (app_worker_t * app_wrk, transport_proto_t tp, + session_handle_t ho_handle); +u64 app_worker_lookup_half_open (app_worker_t * app_wrk, transport_proto_t tp, + session_handle_t ho_handle); +int app_worker_close_notify (app_worker_t * app_wrk, session_t * s); +int app_worker_transport_closed_notify (app_worker_t * app_wrk, + session_t * s); +int app_worker_reset_notify (app_worker_t * app_wrk, session_t * s); +int app_worker_cleanup_notify (app_worker_t * app_wrk, session_t * s, + session_cleanup_ntf_t ntf); +int app_worker_migrate_notify (app_worker_t * app_wrk, session_t * s, + session_handle_t new_sh); +int app_worker_builtin_rx (app_worker_t * app_wrk, session_t * s); +int app_worker_builtin_tx (app_worker_t * app_wrk, session_t * s); +int app_worker_session_fifo_tuning (app_worker_t * app_wrk, session_t * s, + svm_fifo_t * f, + session_ft_action_t act, u32 len); segment_manager_t *app_worker_get_listen_segment_manager (app_worker_t *, session_t *); segment_manager_t *app_worker_get_connect_segment_manager (app_worker_t *); segment_manager_t * app_worker_get_or_alloc_connect_segment_manager (app_worker_t *); int app_worker_alloc_connects_segment_manager (app_worker_t * app); -int app_worker_add_segment_notify (u32 app_or_wrk, u64 segment_handle); +int app_worker_add_segment_notify (app_worker_t * app_wrk, + u64 segment_handle); +int app_worker_del_segment_notify (app_worker_t * app_wrk, + u64 segment_handle); u32 app_worker_n_listeners (app_worker_t * app); session_t *app_worker_first_listener (app_worker_t * app, u8 fib_proto, u8 transport_proto); -u8 app_worker_application_is_builtin (app_worker_t * app_wrk); int app_worker_send_event (app_worker_t * app, session_t * s, u8 evt); int app_worker_lock_and_send_event (app_worker_t * app, session_t * s, u8 evt_type); @@ -285,65 +294,27 @@ session_t *app_worker_proxy_listener (app_worker_t * app, u8 fib_proto, u8 transport_proto); u8 *format_app_worker (u8 * s, va_list * args); u8 *format_app_worker_listener (u8 * s, va_list * args); +u8 *format_crypto_engine (u8 * s, va_list * args); +u8 *format_crypto_context (u8 * s, va_list * args); void app_worker_format_connects (app_worker_t * app_wrk, int verbose); -clib_error_t *vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a); - -/* - * Local session - */ +int vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a); -local_session_t *app_worker_local_session_alloc (app_worker_t * app); -void app_worker_local_session_free (app_worker_t * app, local_session_t * ls); -local_session_t *app_worker_get_local_session (app_worker_t * app, - u32 session_index); -local_session_t *app_worker_get_local_session_from_handle (session_handle_t - handle); -local_session_t - * application_get_local_listen_session_from_handle (session_handle_t lh); -int application_start_local_listen (application_t * server, - session_endpoint_cfg_t * sep, - session_handle_t * handle); -int application_stop_local_listen (u32 app_index, u32 app_or_wrk, - session_handle_t lh); -int app_worker_local_session_connect (app_worker_t * client, - app_worker_t * server, - local_session_t * ls, u32 opaque); -int app_worker_local_session_connect_notify (local_session_t * ls); -int app_worker_local_session_disconnect (u32 app_or_wrk, - local_session_t * ls); -int app_worker_local_session_disconnect_w_index (u32 app_or_wrk, - u32 ls_index); -void app_worker_format_local_sessions (app_worker_t * app_wrk, int verbose); -void app_worker_format_local_connects (app_worker_t * app, int verbose); - -always_inline local_session_t * -application_get_local_listen_session (application_t * app, u32 session_index) -{ - return pool_elt_at_index (app->local_listen_sessions, session_index); -} +uword unformat_application_proto (unformat_input_t * input, va_list * args); -always_inline local_session_t * -application_get_local_listener_w_handle (session_handle_t handle) -{ - u32 server_index, session_index; - application_t *app; - local_session_parse_handle (handle, &server_index, &session_index); - app = application_get (server_index); - return application_get_local_listen_session (app, session_index); -} - -always_inline u8 -application_local_session_listener_has_transport (local_session_t * ls) -{ - transport_proto_t tp; - tp = session_type_transport_proto (ls->listener_session_type); - return (tp != TRANSPORT_PROTO_NONE); -} +app_cert_key_pair_t *app_cert_key_pair_get (u32 index); +app_cert_key_pair_t *app_cert_key_pair_get_if_valid (u32 index); +app_cert_key_pair_t *app_cert_key_pair_get_default (); -void mq_send_local_session_disconnected_cb (u32 app_or_wrk, - local_session_t * ls); +/* Needed while we support both bapi and mq ctrl messages */ +int mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context, + session_handle_t handle, int rv); +int mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, + session_t * s, session_error_t err); +void mq_send_unlisten_reply (app_worker_t * app_wrk, session_handle_t sh, + u32 context, int rv); -uword unformat_application_proto (unformat_input_t * input, va_list * args); +crypto_engine_type_t app_crypto_engine_type_add (void); +u8 app_crypto_engine_n_types (void); #endif /* SRC_VNET_SESSION_APPLICATION_H_ */