X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.h;h=4050cb47bd4e03d68f225474ae537e2ad573c8f2;hb=58d36f02b45c5af38b7df81fb7976129cad3e05b;hp=afe738f199cdc89229747fd99e7a88fe1a46e877;hpb=b384b543313b6b47a277c903e9d4fcd4343054fa;p=vpp.git diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h index afe738f199c..4050cb47bd4 100644 --- a/src/vnet/session/application.h +++ b/src/vnet/session/application.h @@ -20,18 +20,15 @@ #include #include #include -typedef enum -{ - APP_SERVER, - APP_CLIENT, - APP_N_TYPES -} application_type_t; typedef struct _stream_session_cb_vft { /** Notify server of new segment */ int (*add_segment_callback) (u32 api_client_index, const ssvm_private_t * ssvm_seg); + /** Notify server of new segment */ + int (*del_segment_callback) (u32 api_client_index, + const ssvm_private_t * ssvm_seg); /** Notify server of newly accepted session */ int (*session_accept_callback) (stream_session_t * new_session); @@ -46,11 +43,12 @@ typedef struct _stream_session_cb_vft /** Notify app that session was reset */ void (*session_reset_callback) (stream_session_t * s); - /** Direct RX callback, for built-in servers */ - int (*builtin_server_rx_callback) (stream_session_t * session); + /** Direct RX callback for built-in application */ + int (*builtin_app_rx_callback) (stream_session_t * session); + + /** Direct TX callback for built-in application */ + int (*builtin_app_tx_callback) (stream_session_t * session); - /** Redirect connection to local server */ - int (*redirect_connect_callback) (u32 api_client_index, void *mp); } session_cb_vft_t; typedef struct _application @@ -81,8 +79,9 @@ typedef struct _application session_cb_vft_t cb_fns; /* - * svm segment management + * ssvm (fifo) segment management */ + /** Segment manager used for outgoing connects issued by the app */ u32 connects_seg_manager; /** Lookup tables for listeners. Value is segment manager index */ @@ -97,13 +96,41 @@ typedef struct _application u8 first_segment_manager_in_use; /** Segment manager properties. Shared by all segment managers */ - u32 sm_properties; + segment_manager_properties_t sm_properties; u16 proxied_transports; + + /* + * Local "cut through" connections specific + */ + + /** Segment manager used for incoming "cut through" connects */ + u32 local_segment_manager; + + /** Pool of local listen sessions */ + local_session_t *local_listen_sessions; + + /** 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; + + /* + * TLS Specific + */ + + /** Certificate to be used for listen sessions */ + u8 *tls_cert; + + /** PEM encoded key */ + u8 *tls_key; + + /** Preferred tls engine */ + u8 tls_engine; } application_t; #define APP_INVALID_INDEX ((u32)~0) -#define APP_DROP_INDEX (((u32)~0) - 1) #define APP_NS_INVALID_INDEX ((u32)~0) #define APP_INVALID_SEGMENT_MANAGER_INDEX ((u32) ~0) @@ -117,8 +144,14 @@ application_t *application_lookup (u32 api_client_index); u32 application_get_index (application_t * app); int application_start_listen (application_t * app, - session_endpoint_t * tep, u64 * handle); -int application_stop_listen (application_t * srv, u64 handle); + session_endpoint_t * tep, + session_handle_t * handle); +int application_start_local_listen (application_t * server, + session_endpoint_t * sep, + session_handle_t * handle); +int application_stop_listen (application_t * srv, session_handle_t handle); +int application_stop_local_listen (application_t * server, + session_handle_t listener_handle); int application_open_session (application_t * app, session_endpoint_t * tep, u32 api_context); int application_api_queue_is_full (application_t * app); @@ -126,13 +159,15 @@ int application_api_queue_is_full (application_t * app); segment_manager_t *application_get_listen_segment_manager (application_t * app, stream_session_t * - s); + ls); segment_manager_t *application_get_connect_segment_manager (application_t * app); +int application_alloc_connects_segment_manager (application_t * app); + int application_is_proxy (application_t * app); int application_is_builtin (application_t * app); int application_is_builtin_proxy (application_t * app); -int application_add_segment_notify (u32 app_index, u32 fifo_segment_index); +int application_add_segment_notify (u32 app_index, ssvm_private_t * fs); u32 application_session_table (application_t * app, u8 fib_proto); u32 application_local_session_table (application_t * app); u8 *application_name_from_index (u32 app_index); @@ -146,6 +181,90 @@ stream_session_t *application_first_listener (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_properties_t + * application_segment_manager_properties (application_t * app); + +local_session_t *application_alloc_local_session (application_t * app); +void application_free_local_session (application_t * app, + local_session_t * ls); +local_session_t *application_get_local_session (application_t * app, + u32 session_index); +local_session_t *application_get_local_session_from_handle (session_handle_t + handle); +int application_local_session_connect (u32 table_index, + application_t * client, + application_t * server, + local_session_t * ll, u32 opaque); +int application_local_session_connect_notify (local_session_t * ls); +int application_local_session_disconnect (u32 app_index, + local_session_t * ls); +void application_local_sessions_del (application_t * app); + +always_inline u32 +local_session_id (local_session_t * ll) +{ + ASSERT (ll->app_index < (2 << 16) && ll->session_index < (2 << 16)); + return ((u32) ll->app_index << 16 | (u32) ll->session_index); +} + +always_inline void +local_session_parse_id (u32 ls_id, u32 * app_index, u32 * session_index) +{ + *app_index = ls_id >> 16; + *session_index = ls_id & 0xFFF; +} + +always_inline void +local_session_parse_handle (session_handle_t handle, u32 * server_index, + u32 * session_index) +{ + u32 bottom; + ASSERT ((handle >> 32) == SESSION_LOCAL_HANDLE_PREFIX); + bottom = (handle & 0xFFFFFFFF); + local_session_parse_id (bottom, server_index, session_index); +} + +always_inline session_handle_t +application_local_session_handle (local_session_t * ls) +{ + return ((u64) SESSION_LOCAL_HANDLE_PREFIX << 32) + | (u64) local_session_id (ls); +} + +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); +} + +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); +} + +void send_local_session_disconnect_callback (u32 app_index, + local_session_t * ls); + +int application_connect (u32 client_index, u32 api_context, + session_endpoint_t * sep); + +uword unformat_application_proto (unformat_input_t * input, va_list * args); + #endif /* SRC_VNET_SESSION_APPLICATION_H_ */ /*