session: refactor local connects

[vpp.git] / src / vnet / session / application.h

diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h
index 19a8a11..0904c23 100644 (file)
--- a/src/vnet/session/application.h
+++ b/src/vnet/session/application.h
@@ -59,19 +59,6 @@ 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;
 
@@ -121,12 +108,6 @@ 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
    */
@@ -194,6 +175,7 @@ app_listener_t *app_listener_get_w_handle (session_handle_t handle);
 app_listener_t *app_listener_get_w_session (session_t * ls);
 app_worker_t *app_listener_select_worker (app_listener_t * al);
 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);
@@ -248,7 +230,10 @@ 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);
@@ -263,54 +248,6 @@ u8 *format_app_worker_listener (u8 * s, va_list * args);
 void app_worker_format_connects (app_worker_t * app_wrk, int verbose);
 int vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a);
 
-/*
- * Local session
- */
-
-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);
-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);
-}
-
-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 mq_send_local_session_disconnected_cb (u32 app_or_wrk,
-                                           local_session_t * ls);
-
 uword unformat_application_proto (unformat_input_t * input, va_list * args);
 
 #endif /* SRC_VNET_SESSION_APPLICATION_H_ */