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

quic: fix server opening stream immediately

Browse Source 
Previously, if the first thing a server did was to open a stream and
send data, this could trigger a crash on the clilent side VPP as the
quic session wouldn't be allocated.

Change-Id: I43990ce2a71217d6719ecae4da60111d05fbcfc0
Type: fix
Signed-off-by: Aloys Augustin <aloaugus@cisco.com>
(cherry picked from commit ffbfe3a2d6)
This commit is contained in:
Aloys Augustin
2019-09-05 17:58:21 +02:00
committed by Andrew Yourtchenko
parent 9636f97482
commit 587eeecf0d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
static quic_main_t quic_main;
static void quic_update_timer (quic_ctx_t * ctx);
static int quic_on_client_connected (quic_ctx_t * ctx);
static u32
quic_ctx_alloc (u32 thread_index)
@ -595,6 +596,22 @@ quic_accept_stream (void *s)
qctx = quic_get_conn_ctx (stream->conn);
/* Might need to signal that the connection is ready if the first thing the
* server does is open a stream */
if (qctx->conn_state == QUIC_CONN_STATE_HANDSHAKE)
{
if (quicly_connection_is_ready (qctx->conn))
{
qctx->conn_state = QUIC_CONN_STATE_READY;
if (quicly_is_client (qctx->conn))
{
quic_on_client_connected (qctx);
/* ctx might be invalidated */
qctx = quic_get_conn_ctx (stream->conn);
}
}
}
stream_session = session_alloc (qctx->c_thread_index);
QUIC_DBG (2, "ACCEPTED stream_session 0x%lx ctx %u",
session_handle (stream_session), sctx_id);
@ -652,9 +669,7 @@ quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream)
/* Notify accept on parent qsession, but only if this is not a locally
* initiated stream */
if (!quicly_stream_is_self_initiated (stream))
{
quic_accept_stream (stream);
}
quic_accept_stream (stream);
return 0;
}

2
src/plugins/quic/quic.h
View File

@ -158,7 +158,7 @@ typedef struct quic_main_
u32 app_index;
quic_ctx_t **ctx_pool;
quic_worker_ctx_t *wrk_ctx;
clib_bihash_16_8_t connection_hash; /* quicly connection id -> conn handle */
clib_bihash_16_8_t connection_hash; /* quic connection id -> conn handle */
f64 tstamp_ticks_per_clock;
ptls_cipher_suite_t ***quic_ciphers; /* available ciphers by crypto engine */