X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftls%2Ftls.c;h=a34d0db6c88d1fa4470aa1883233ec51a5dbbd9b;hb=2179513b71963a0b42ca6f1f2b641e79ce89447b;hp=4fb0dfb3c917b9db6f0afc7fd45ee7a498383d20;hpb=e6446a3cd5f4b4faab87127c1a310e3c7fbf0e60;p=vpp.git

diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c
index 4fb0dfb3c91..a34d0db6c88 100644
--- a/src/vnet/tls/tls.c
+++ b/src/vnet/tls/tls.c
@@ -49,7 +49,7 @@ tls_add_vpp_q_evt (svm_fifo_t * f, u8 evt_type)
 static inline int
 tls_add_app_q_evt (app_worker_t * app, stream_session_t * app_session)
 {
-  return application_send_event (app, app_session, FIFO_EVENT_APP_RX);
+  return app_worker_lock_and_send_event (app, app_session, FIFO_EVENT_APP_RX);
 }
 
 u32
@@ -168,7 +168,7 @@ tls_notify_app_accept (tls_ctx_t * ctx)
   app_session->session_type = app_listener->session_type;
   app_session->listener_index = app_listener->session_index;
   sm = app_worker_get_listen_segment_manager (app_wrk, app_listener);
-  app_session->opaque = tls_main.app_index;
+  app_session->t_app_index = tls_main.app_index;
 
   if ((rv = session_alloc_fifos (sm, app_session)))
     {
@@ -202,7 +202,7 @@ tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
   app_session->connection_index = ctx->tls_ctx_handle;
   app_session->session_type =
     session_type_from_proto_and_ip (TRANSPORT_PROTO_TLS, ctx->tcp_is_ip4);
-  app_session->opaque = tls_main.app_index;
+  app_session->t_app_index = tls_main.app_index;
 
   if (session_alloc_fifos (sm, app_session))
     goto failed;
@@ -522,14 +522,15 @@ tls_disconnect (u32 ctx_handle, u32 thread_index)
 u32
 tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
 {
-  app_worker_t *tls_app_wrk, *app_wrk;
+  vnet_bind_args_t _bargs, *args = &_bargs;
+  app_worker_t *app_wrk;
   tls_main_t *tm = &tls_main;
   session_handle_t tls_handle;
   session_endpoint_extended_t *sep;
   stream_session_t *tls_listener;
   stream_session_t *app_listener;
   tls_engine_type_t engine_type;
-  application_t *app, *tls_app;
+  application_t *app;
   tls_ctx_t *lctx;
   u32 lctx_index;
 
@@ -543,16 +544,15 @@ tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
       return -1;
     }
 
-  lctx_index = tls_listener_ctx_alloc ();
-
-  /* TODO hide this by calling vnet_bind() */
-  tls_app = application_get (tm->app_index);
-  tls_app_wrk = application_get_default_worker (tls_app);
   sep->transport_proto = TRANSPORT_PROTO_TCP;
-  if (app_worker_start_listen (tls_app_wrk, (session_endpoint_t *) sep,
-			       &tls_handle))
-    return ~0;
+  memset (args, 0, sizeof (*args));
+  args->app_index = tm->app_index;
+  args->sep_ext = *sep;
+  if (vnet_bind (args))
+    return -1;
 
+  tls_handle = args->handle;
+  lctx_index = tls_listener_ctx_alloc ();
   tls_listener = listen_session_get_from_handle (tls_handle);
   tls_listener->opaque = lctx_index;
 
@@ -580,7 +580,8 @@ tls_stop_listen (u32 lctx_index)
   tls_engine_type_t engine_type;
 
   lctx = tls_listener_ctx_get (lctx_index);
-  app_worker_stop_listen (lctx->tls_session_handle, tm->app_index);
+  /* TODO use unbind */
+  application_stop_listen (tm->app_index, 0, lctx->tls_session_handle);
   engine_type = lctx->tls_ctx_engine;
   tls_vfts[engine_type].ctx_stop_listen (lctx);
 
@@ -713,6 +714,7 @@ tls_init (vlib_main_t * vm)
   a->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size;
   a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
   a->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
+  a->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_IS_TRANSPORT_APP;
 
   if (vnet_application_attach (a))
     {