diff options
| author |   Florin Coras <fcoras@cisco.com> | 2018-12-14 11:28:43 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-12-17 08:47:39 +0000 |
| commit | 3c7d4f9e1f54ec6627795b64525f182e2cda7490 (patch) | |
| tree | 8d9ca4efe66a2f8f7cf56a3fe9c9d3b92561b26f /src/vnet/session/session.c | |
| parent | 7bb27caf62f5fa942be68015aeb0543566d22371 (diff) | |
vcl/session: handle reset/disconnect before app accept
Also further improves reset handling.
Change-Id: I6e517632f700f181761726b965134e0c217eb06d
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session/session.c')
| -rw-r--r-- | src/vnet/session/session.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 6533303d0c6..7f9a32f46de 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -836,6 +836,9 @@ stream_session_reset_notify (transport_connection_t * tc) application_t *app; s = session_get (tc->s_index, tc->thread_index); svm_fifo_dequeue_drop_all (s->server_tx_fifo); + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) + return; + s->session_state = SESSION_STATE_TRANSPORT_CLOSING; app_wrk = app_worker_get (s->app_wrk_index); app = application_get (app_wrk->app_index); app->cb_fns.session_reset_callback (s); @@ -1204,11 +1207,10 @@ session_vpp_event_queues_allocate (session_manager_main_t * smm) for (i = 0; i < vec_len (smm->wrk); i++) { svm_msg_q_cfg_t _cfg, *cfg = &_cfg; - u32 notif_q_size = clib_max (16, evt_q_length >> 4); svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = { {evt_q_length, evt_size, 0} , - {notif_q_size, 256, 0} + {evt_q_length << 1, 256, 0} }; cfg->consumer_pid = 0; cfg->n_rings = 2; |