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
f4814a3
..
fdba08c
100644
(file)
--- a/
src/vnet/tls/tls.c
+++ b/
src/vnet/tls/tls.c
@@
-96,7
+96,7
@@
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;
}
return ctx - tm->listener_ctx_pool;
}
@@
-144,7
+144,7
@@
tls_ctx_half_open_alloc (void)
ctx_index = ctx - tm->half_open_ctx_pool;
clib_rwlock_reader_unlock (&tm->half_open_rwlock);
}
ctx_index = ctx - tm->half_open_ctx_pool;
clib_rwlock_reader_unlock (&tm->half_open_rwlock);
}
- memset (ctx, 0, sizeof (*ctx));
+
clib_
memset (ctx, 0, sizeof (*ctx));
return ctx_index;
}
return ctx_index;
}
@@
-367,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;
}
@@
-390,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;
@@
-479,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);
@@
-511,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;
@@
-523,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);
@@
-548,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;
@@
-568,7
+568,7
@@
tls_disconnect (u32 ctx_handle, u32 thread_index)
ctx = tls_ctx_get (ctx_handle);
tls_disconnect_transport (ctx);
ctx = tls_ctx_get (ctx_handle);
tls_disconnect_transport (ctx);
- s
tream_session
_delete_notify (&ctx->connection);
+ s
ession_transport
_delete_notify (&ctx->connection);
tls_ctx_free (ctx);
}
tls_ctx_free (ctx);
}
@@
-579,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;
@@
-587,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);
@@
-598,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))
@@
-762,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;