void
tls_notify_app_enqueue (tls_ctx_t * ctx, session_t * app_session)
{
- app_worker_t *app;
- app = app_worker_get_if_valid (app_session->app_wrk_index);
- if (PREDICT_TRUE (app != 0))
- tls_add_app_q_evt (app, app_session);
+ app_worker_t *app_wrk;
+ app_wrk = app_worker_get_if_valid (app_session->app_wrk_index);
+ if (PREDICT_TRUE (app_wrk != 0))
+ tls_add_app_q_evt (app_wrk, app_session);
}
int
app_session->connection_index = ctx->tls_ctx_handle;
app_session->session_type = app_listener->session_type;
app_session->listener_index = app_listener->session_index;
- app_session->t_app_index = tls_main.app_index;
app_session->session_state = SESSION_STATE_ACCEPTING;
if ((rv = app_worker_init_accepted (app_session)))
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->t_app_index = tls_main.app_index;
if (app_worker_init_connected (app_wrk, app_session))
goto failed;
void
tls_session_disconnect_callback (session_t * tls_session)
{
- session_t *app_session;
tls_ctx_t *ctx;
- app_worker_t *app_wrk;
- application_t *app;
+
+ TLS_DBG (1, "TCP disconnecting handle %x session %u", tls_session->opaque,
+ tls_session->session_index);
ctx = tls_ctx_get (tls_session->opaque);
if (!tls_ctx_handshake_is_over (ctx))
return;
}
ctx->is_passive_close = 1;
- app_wrk = app_worker_get (ctx->parent_app_wrk_index);
- app = application_get (app_wrk->app_index);
- app_session = session_get_from_handle (ctx->app_session_handle);
- app->cb_fns.session_disconnect_callback (app_session);
+ session_transport_closing_notify (&ctx->connection);
}
int
{
session_t *app_session = (session_t *) session;
tls_ctx_t *ctx;
- if (PREDICT_FALSE (app_session->session_state == SESSION_STATE_CLOSED))
+
+ if (PREDICT_FALSE (app_session->session_state
+ >= SESSION_STATE_TRANSPORT_CLOSED))
return 0;
+
ctx = tls_ctx_get (app_session->connection_index);
tls_ctx_write (ctx, app_session);
return 0;
u8 *
format_tls_ctx (u8 * s, va_list * args)
{
+ u32 tcp_si, tcp_ti, ctx_index, ctx_engine, app_si, app_ti;
tls_ctx_t *ctx = va_arg (*args, tls_ctx_t *);
- u32 thread_index = va_arg (*args, u32);
- u32 child_si, child_ti;
- session_parse_handle (ctx->tls_session_handle, &child_si, &child_ti);
- if (thread_index != child_ti)
- clib_warning ("app and tls sessions are on different threads!");
+ session_parse_handle (ctx->tls_session_handle, &tcp_si, &tcp_ti);
+ tls_ctx_parse_handle (ctx->tls_ctx_handle, &ctx_index, &ctx_engine);
+ session_parse_handle (ctx->app_session_handle, &app_si, &app_ti);
+ s = format (s, "[%d:%d][TLS] app_wrk %u index %u engine %u tcp %d:%d",
+ app_ti, app_si, ctx->parent_app_wrk_index, ctx_index,
+ ctx_engine, tcp_ti, tcp_si);
- s = format (s, "[#%d][TLS] app %u child %u", child_ti,
- ctx->parent_app_wrk_index, child_si);
return s;
}
if (!ctx)
return s;
- s = format (s, "%-50U", format_tls_ctx, ctx, thread_index);
+ s = format (s, "%-50U", format_tls_ctx, ctx);
if (verbose)
{
session_t *ts;
u32 tc_index = va_arg (*args, u32);
u32 __clib_unused verbose = va_arg (*args, u32);
tls_ctx_t *ctx = tls_listener_ctx_get (tc_index);
- u32 listener_index, thread_index;
+ session_t *tls_listener;
+ app_listener_t *al;
+ u32 app_si, app_ti;
- listen_session_parse_handle (ctx->tls_session_handle, &listener_index,
- &thread_index);
- return format (s, "[TLS] listener app %u child %u",
- ctx->parent_app_wrk_index, listener_index);
+ al = app_listener_get_w_handle (ctx->tls_session_handle);
+ tls_listener = app_listener_get_session (al);
+ session_parse_handle (ctx->app_session_handle, &app_si, &app_ti);
+ s = format (s, "[%d:%d][TLS] app_wrk %u engine %u tcp %d:%d",
+ app_ti, app_si, ctx->parent_app_wrk_index, ctx->tls_ctx_engine,
+ tls_listener->thread_index, tls_listener->session_index);
+ return s;
}
u8 *
static clib_error_t *
tls_init (vlib_main_t * vm)
{
+ u32 add_segment_size = (4096ULL << 20) - 1, first_seg_size = 32 << 20;
vlib_thread_main_t *vtm = vlib_get_thread_main ();
+ u32 num_threads, fifo_size = 128 << 10;
vnet_app_attach_args_t _a, *a = &_a;
u64 options[APP_OPTIONS_N_OPTIONS];
- u32 segment_size = 512 << 20;
tls_main_t *tm = &tls_main;
- u32 fifo_size = 64 << 10;
- u32 num_threads;
+ first_seg_size = tm->first_seg_size ? tm->first_seg_size : first_seg_size;
+ fifo_size = tm->fifo_size ? tm->fifo_size : fifo_size;
num_threads = 1 /* main thread */ + vtm->n_threads;
clib_memset (a, 0, sizeof (*a));
a->api_client_index = APP_INVALID_INDEX;
a->options = options;
a->name = format (0, "tls");
- a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size;
- a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size;
+ a->options[APP_OPTIONS_SEGMENT_SIZE] = first_seg_size;
+ a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = add_segment_size;
a->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size;
a->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size;
a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
tm->use_test_cert_in_ca = 1;
else if (unformat (input, "ca-cert-path %s", &tm->ca_cert_path))
;
+ else if (unformat (input, "first-segment-size %U", unformat_memory_size,
+ &tm->first_seg_size))
+ ;
+ else if (unformat (input, "fifo-size %U", unformat_memory_size,
+ &tm->fifo_size))
+ ;
else
return clib_error_return (0, "unknown input `%U'",
format_unformat_error, input);