Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: free session after transport and app confirm
[vpp.git]
/
src
/
vnet
/
tls
/
tls.c
diff --git
a/src/vnet/tls/tls.c
b/src/vnet/tls/tls.c
index
aba7919
..
fdba08c
100644
(file)
--- a/
src/vnet/tls/tls.c
+++ b/
src/vnet/tls/tls.c
@@
-26,6
+26,18
@@
static tls_engine_vft_t *tls_vfts;
void tls_disconnect (u32 ctx_handle, u32 thread_index);
void tls_disconnect (u32 ctx_handle, u32 thread_index);
+static void
+tls_disconnect_transport (tls_ctx_t * ctx)
+{
+ vnet_disconnect_args_t a = {
+ .handle = ctx->tls_session_handle,
+ .app_index = tls_main.app_index,
+ };
+
+ if (vnet_disconnect_session (&a))
+ clib_warning ("disconnect returned");
+}
+
tls_engine_type_t
tls_get_available_engine (void)
{
tls_engine_type_t
tls_get_available_engine (void)
{
@@
-84,13
+96,15
@@
tls_listener_ctx_alloc (void)
tls_ctx_t *ctx;
pool_get (tm->listener_ctx_pool, ctx);
tls_ctx_t *ctx;
pool_get (tm->listener_ctx_pool, ctx);
- memset (ctx, 0, sizeof (*ctx));
+
clib_
memset (ctx, 0, sizeof (*ctx));
return ctx - tm->listener_ctx_pool;
}
void
tls_listener_ctx_free (tls_ctx_t * ctx)
{
return ctx - tm->listener_ctx_pool;
}
void
tls_listener_ctx_free (tls_ctx_t * ctx)
{
+ if (CLIB_DEBUG)
+ memset (ctx, 0xfb, sizeof (*ctx));
pool_put (tls_main.listener_ctx_pool, ctx);
}
pool_put (tls_main.listener_ctx_pool, ctx);
}
@@
-119,6
+133,7
@@
tls_ctx_half_open_alloc (void)
{
clib_rwlock_writer_lock (&tm->half_open_rwlock);
pool_get (tm->half_open_ctx_pool, ctx);
{
clib_rwlock_writer_lock (&tm->half_open_rwlock);
pool_get (tm->half_open_ctx_pool, ctx);
+ ctx_index = ctx - tm->half_open_ctx_pool;
clib_rwlock_writer_unlock (&tm->half_open_rwlock);
}
else
clib_rwlock_writer_unlock (&tm->half_open_rwlock);
}
else
@@
-126,10
+141,10
@@
tls_ctx_half_open_alloc (void)
/* reader lock assumption: only main thread will call pool_get */
clib_rwlock_reader_lock (&tm->half_open_rwlock);
pool_get (tm->half_open_ctx_pool, ctx);
/* reader lock assumption: only main thread will call pool_get */
clib_rwlock_reader_lock (&tm->half_open_rwlock);
pool_get (tm->half_open_ctx_pool, ctx);
+ ctx_index = ctx - tm->half_open_ctx_pool;
clib_rwlock_reader_unlock (&tm->half_open_rwlock);
}
clib_rwlock_reader_unlock (&tm->half_open_rwlock);
}
- memset (ctx, 0, sizeof (*ctx));
- ctx_index = ctx - tm->half_open_ctx_pool;
+ clib_memset (ctx, 0, sizeof (*ctx));
return ctx_index;
}
return ctx_index;
}
@@
-225,7
+240,7
@@
tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
app_wrk = app_worker_get_if_valid (ctx->parent_app_index);
if (!app_wrk)
{
app_wrk = app_worker_get_if_valid (ctx->parent_app_index);
if (!app_wrk)
{
- tls_disconnect
(ctx->tls_ctx_handle, vlib_get_thread_index ()
);
+ tls_disconnect
_transport (ctx
);
return -1;
}
return -1;
}
@@
-248,14
+263,16
@@
tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
ctx->app_session_handle = session_handle (app_session);
ctx->c_s_index = app_session->session_index;
ctx->app_session_handle = session_handle (app_session);
ctx->c_s_index = app_session->session_index;
- app_session->session_state = SESSION_STATE_
READY
;
+ app_session->session_state = SESSION_STATE_
CONNECTING
;
if (cb_fn (ctx->parent_app_index, ctx->parent_app_api_context,
app_session, 0 /* not failed */ ))
{
TLS_DBG (1, "failed to notify app");
tls_disconnect (ctx->tls_ctx_handle, vlib_get_thread_index ());
if (cb_fn (ctx->parent_app_index, ctx->parent_app_api_context,
app_session, 0 /* not failed */ ))
{
TLS_DBG (1, "failed to notify app");
tls_disconnect (ctx->tls_ctx_handle, vlib_get_thread_index ());
+ return -1;
}
}
+ app_session->session_state = SESSION_STATE_READY;
session_lookup_add_connection (&ctx->connection,
session_handle (app_session));
session_lookup_add_connection (&ctx->connection,
session_handle (app_session));
@@
-350,14
+367,14
@@
tls_session_reset_callback (stream_session_t * s)
}
int
}
int
-tls_add_segment_callback (u32 client_index,
const ssvm_private_t * fs
)
+tls_add_segment_callback (u32 client_index,
u64 segment_handle
)
{
/* No-op for builtin */
return 0;
}
int
{
/* No-op for builtin */
return 0;
}
int
-tls_del_segment_callback (u32 client_index,
const ssvm_private_t * fs
)
+tls_del_segment_callback (u32 client_index,
u64 segment_handle
)
{
return 0;
}
{
return 0;
}
@@
-373,7
+390,7
@@
tls_session_disconnect_callback (stream_session_t * tls_session)
ctx = tls_ctx_get (tls_session->opaque);
if (!tls_ctx_handshake_is_over (ctx))
{
ctx = tls_ctx_get (tls_session->opaque);
if (!tls_ctx_handshake_is_over (ctx))
{
- s
tream_session_disconnect
(tls_session);
+ s
ession_close
(tls_session);
return;
}
ctx->is_passive_close = 1;
return;
}
ctx->is_passive_close = 1;
@@
-462,7
+479,7
@@
tls_session_connected_callback (u32 tls_app_index, u32 ho_ctx_index,
ctx_handle = tls_ctx_alloc (ho_ctx->tls_ctx_engine);
ctx = tls_ctx_get (ctx_handle);
ctx_handle = tls_ctx_alloc (ho_ctx->tls_ctx_engine);
ctx = tls_ctx_get (ctx_handle);
- clib_memcpy (ctx, ho_ctx, sizeof (*ctx));
+ clib_memcpy
_fast
(ctx, ho_ctx, sizeof (*ctx));
tls_ctx_half_open_reader_unlock ();
tls_ctx_half_open_free (ho_ctx_index);
tls_ctx_half_open_reader_unlock ();
tls_ctx_half_open_free (ho_ctx_index);
@@
-494,10
+511,10
@@
static session_cb_vft_t tls_app_cb_vft = {
/* *INDENT-ON* */
int
/* *INDENT-ON* */
int
-tls_connect (transport_endpoint_t * tep)
+tls_connect (transport_endpoint_
cfg_
t * tep)
{
vnet_connect_args_t _cargs = { {}, }, *cargs = &_cargs;
{
vnet_connect_args_t _cargs = { {}, }, *cargs = &_cargs;
- session_endpoint_
extended
_t *sep;
+ session_endpoint_
cfg
_t *sep;
tls_engine_type_t engine_type;
tls_main_t *tm = &tls_main;
app_worker_t *app_wrk;
tls_engine_type_t engine_type;
tls_main_t *tm = &tls_main;
app_worker_t *app_wrk;
@@
-506,7
+523,7
@@
tls_connect (transport_endpoint_t * tep)
tls_ctx_t *ctx;
u32 ctx_index;
tls_ctx_t *ctx;
u32 ctx_index;
- sep = (session_endpoint_
extended
_t *) tep;
+ sep = (session_endpoint_
cfg
_t *) tep;
app_wrk = app_worker_get (sep->app_wrk_index);
app = application_get (app_wrk->app_index);
engine_type = tls_get_engine_type (app->tls_engine);
app_wrk = app_worker_get (sep->app_wrk_index);
app = application_get (app_wrk->app_index);
engine_type = tls_get_engine_type (app->tls_engine);
@@
-531,7
+548,7
@@
tls_connect (transport_endpoint_t * tep)
app_worker_alloc_connects_segment_manager (app_wrk);
ctx->tls_ctx_engine = engine_type;
app_worker_alloc_connects_segment_manager (app_wrk);
ctx->tls_ctx_engine = engine_type;
- clib_memcpy (&cargs->sep, sep, sizeof (session_endpoint_t));
+ clib_memcpy
_fast
(&cargs->sep, sep, sizeof (session_endpoint_t));
cargs->sep.transport_proto = TRANSPORT_PROTO_TCP;
cargs->app_index = tm->app_index;
cargs->api_context = ctx_index;
cargs->sep.transport_proto = TRANSPORT_PROTO_TCP;
cargs->app_index = tm->app_index;
cargs->api_context = ctx_index;
@@
-550,16
+567,8
@@
tls_disconnect (u32 ctx_handle, u32 thread_index)
TLS_DBG (1, "Disconnecting %x", ctx_handle);
ctx = tls_ctx_get (ctx_handle);
TLS_DBG (1, "Disconnecting %x", ctx_handle);
ctx = tls_ctx_get (ctx_handle);
-
- vnet_disconnect_args_t a = {
- .handle = ctx->tls_session_handle,
- .app_index = tls_main.app_index,
- };
-
- if (vnet_disconnect_session (&a))
- clib_warning ("disconnect returned");
-
- stream_session_delete_notify (&ctx->connection);
+ tls_disconnect_transport (ctx);
+ session_transport_delete_notify (&ctx->connection);
tls_ctx_free (ctx);
}
tls_ctx_free (ctx);
}
@@
-570,7
+579,7
@@
tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
app_worker_t *app_wrk;
tls_main_t *tm = &tls_main;
session_handle_t tls_handle;
app_worker_t *app_wrk;
tls_main_t *tm = &tls_main;
session_handle_t tls_handle;
- session_endpoint_
extended
_t *sep;
+ session_endpoint_
cfg
_t *sep;
stream_session_t *tls_listener;
stream_session_t *app_listener;
tls_engine_type_t engine_type;
stream_session_t *tls_listener;
stream_session_t *app_listener;
tls_engine_type_t engine_type;
@@
-578,7
+587,7
@@
tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
tls_ctx_t *lctx;
u32 lctx_index;
tls_ctx_t *lctx;
u32 lctx_index;
- sep = (session_endpoint_
extended
_t *) tep;
+ sep = (session_endpoint_
cfg
_t *) tep;
app_wrk = app_worker_get (sep->app_wrk_index);
app = application_get (app_wrk->app_index);
engine_type = tls_get_engine_type (app->tls_engine);
app_wrk = app_worker_get (sep->app_wrk_index);
app = application_get (app_wrk->app_index);
engine_type = tls_get_engine_type (app->tls_engine);
@@
-589,7
+598,7
@@
tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
}
sep->transport_proto = TRANSPORT_PROTO_TCP;
}
sep->transport_proto = TRANSPORT_PROTO_TCP;
- memset (args, 0, sizeof (*args));
+
clib_
memset (args, 0, sizeof (*args));
args->app_index = tm->app_index;
args->sep_ext = *sep;
if (vnet_bind (args))
args->app_index = tm->app_index;
args->sep_ext = *sep;
if (vnet_bind (args))
@@
-753,8
+762,8
@@
tls_init (vlib_main_t * vm)
num_threads = 1 /* main thread */ + vtm->n_threads;
num_threads = 1 /* main thread */ + vtm->n_threads;
- memset (a, 0, sizeof (*a));
- memset (options, 0, sizeof (options));
+
clib_
memset (a, 0, sizeof (*a));
+
clib_
memset (options, 0, sizeof (options));
a->session_cb_vft = &tls_app_cb_vft;
a->api_client_index = APP_INVALID_INDEX;
a->session_cb_vft = &tls_app_cb_vft;
a->api_client_index = APP_INVALID_INDEX;