ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quic: Hotfix crypto context on migrate

Browse Source 
Type: fix

quicly_connections have internal references to crypto
contexts which need to be updated when we switch thread
as the supporting pools are thread-based.
This under the assumption that the new contexts will be
exactly identical

Change-Id: I38083e59657ff068e347d9e7b47abe91a1167b6c
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
(cherry picked from commit d9942bcc61d83cee390fc2c6a428e562ec9750f0)
This commit is contained in:
Nathan Skrzypczak
2019-12-18 13:37:45 +01:00
committed by Andrew Yourtchenko
parent bb49148160
commit 48ec77e84e
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/quic/quic.c
View File

@ -1464,6 +1464,19 @@ quic_on_client_connected (quic_ctx_t * ctx)
return 0; return 0;
} }
static inline void
quic_update_conn_ctx (quicly_conn_t * conn, quicly_context_t * quicly_context)
{
/* we need to update the quicly_conn on migrate
* as it contains a pointer to the crypto context */
ptls_context_t **tls;
quicly_context_t **_quicly_context;
_quicly_context = (quicly_context_t **) conn;
*_quicly_context = quicly_context;
tls = (ptls_context_t **) quicly_get_tls (conn);
*tls = quicly_context->tls;
}
static void static void
quic_receive_connection (void *arg) quic_receive_connection (void *arg)
{ {
@ -1471,6 +1484,7 @@ quic_receive_connection (void *arg)
quic_ctx_t *temp_ctx, *new_ctx; quic_ctx_t *temp_ctx, *new_ctx;
clib_bihash_kv_16_8_t kv; clib_bihash_kv_16_8_t kv;
quicly_conn_t *conn; quicly_conn_t *conn;
quicly_context_t *quicly_context;
session_t *udp_session; session_t *udp_session;
temp_ctx = arg; temp_ctx = arg;
@ -1488,6 +1502,9 @@ quic_receive_connection (void *arg)
new_ctx->c_c_index = new_ctx_id; new_ctx->c_c_index = new_ctx_id;
conn = new_ctx->conn; conn = new_ctx->conn;
quicly_context = quic_get_quicly_ctx_from_ctx (new_ctx);
quic_update_conn_ctx (conn, quicly_context);
quic_store_conn_ctx (conn, new_ctx); quic_store_conn_ctx (conn, new_ctx);
quic_make_connection_key (&kv, quicly_get_master_id (conn)); quic_make_connection_key (&kv, quicly_get_master_id (conn));
kv.value = ((u64) thread_index) << 32 | (u64) new_ctx_id; kv.value = ((u64) thread_index) << 32 | (u64) new_ctx_id;