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

session: handle accept and connect errors

Browse Source 
If builtin apps refuse connections, they should be cleaned up.

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I95ef22902ac3fe873e15e250aa5f03031c2dc0c4
(cherry picked from commit 9ffec14a22)
This commit is contained in:
Florin Coras
2023-10-06 16:45:04 -07:00
committed by Dave Wallace
parent 4ba523740f
commit 3c06859f9f
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/vnet/session/session_input.c
View File

@ -77,10 +77,11 @@ app_worker_flush_events_inline (app_worker_t *app_wrk, u32 thread_index,
{ {
application_t *app = application_get (app_wrk->app_index); application_t *app = application_get (app_wrk->app_index);
svm_msg_q_t *mq = app_wrk->event_queue; svm_msg_q_t *mq = app_wrk->event_queue;
u8 ring_index, mq_is_cong, was_closed;
session_event_t *evt; session_event_t *evt;
u32 n_evts = 128, i; u32 n_evts = 128, i;
u8 ring_index, mq_is_cong;
session_t *s; session_t *s;
int rv;
n_evts = clib_min (n_evts, clib_fifo_elts (app_wrk->wrk_evts[thread_index])); n_evts = clib_min (n_evts, clib_fifo_elts (app_wrk->wrk_evts[thread_index]));
@ -145,16 +146,37 @@ app_worker_flush_events_inline (app_worker_t *app_wrk, u32 thread_index,
break; break;
case SESSION_CTRL_EVT_ACCEPTED: case SESSION_CTRL_EVT_ACCEPTED:
s = session_get (evt->session_index, thread_index); s = session_get (evt->session_index, thread_index);
app->cb_fns.session_accept_callback (s); was_closed = s->session_state >= SESSION_STATE_TRANSPORT_CLOSING;
if (app->cb_fns.session_accept_callback (s))
{
session_close (s);
s->app_wrk_index = SESSION_INVALID_INDEX;
break;
}
if (is_builtin && was_closed)
app_worker_close_notify (app_wrk, s);
break; break;
case SESSION_CTRL_EVT_CONNECTED: case SESSION_CTRL_EVT_CONNECTED:
if (!(evt->as_u64[1] & 0xffffffff)) if (!(evt->as_u64[1] & 0xffffffff))
{
s = session_get (evt->session_index, thread_index); s = session_get (evt->session_index, thread_index);
was_closed = s->session_state >= SESSION_STATE_TRANSPORT_CLOSING;
}
else else
s = 0; s = 0;
app->cb_fns.session_connected_callback (app_wrk->wrk_index, rv = app->cb_fns.session_connected_callback (
evt->as_u64[1] >> 32, s, app_wrk->wrk_index, evt->as_u64[1] >> 32, s,
evt->as_u64[1] & 0xffffffff); evt->as_u64[1] & 0xffffffff);
if (!s)
break;
if (rv)
{
session_close (s);
s->app_wrk_index = SESSION_INVALID_INDEX;
break;
}
if (was_closed)
app_worker_close_notify (app_wrk, s);
break; break;
case SESSION_CTRL_EVT_DISCONNECTED: case SESSION_CTRL_EVT_DISCONNECTED:
s = session_get (evt->session_index, thread_index); s = session_get (evt->session_index, thread_index);

1
src/vnet/session/session_node.c
View File

@ -456,6 +456,7 @@ session_mq_accepted_reply_handler (session_worker_t *wrk,
a->app_index = mp->context; a->app_index = mp->context;
a->handle = mp->handle; a->handle = mp->handle;
vnet_disconnect_session (a); vnet_disconnect_session (a);
s->app_wrk_index = SESSION_INVALID_INDEX;
return; return;
} }