diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-02-20 19:48:31 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-21 12:27:11 +0000 |
| commit | dfae9f938f81480995a7ef20a63d016e57dd2899 (patch) | |
| tree | b54851bda6d1931b96c0d30f822bf5876b75bca9 /src/vcl/vppcom.c | |
| parent | 565115edf0d6689a3f362c69240c160b49807156 (diff) | |
vcl/session: send unlisten over message queue
Change-Id: I68cd6c0e6be3e8088792df3885ae190bb00462b0
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vcl/vppcom.c')
| -rw-r--r-- | src/vcl/vppcom.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index eecb2f48ce2..cc7a27642a8 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -533,6 +533,30 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) return sid; } +static void +vcl_session_unlisten_reply_handler (vcl_worker_t * wrk, void *data) +{ + session_unlisten_reply_msg_t *mp = (session_unlisten_reply_msg_t *) data; + vcl_session_t *s; + + s = vcl_session_get_w_vpp_handle (wrk, mp->handle); + if (!s || s->session_state != STATE_DISCONNECT) + { + VDBG (0, "Unlisten reply with wrong handle %llx", mp->handle); + return; + } + + if (mp->retval) + VDBG (0, "ERROR: session %u [0xllx]: unlisten failed: %U", + s->session_index, mp->handle, format_api_error, ntohl (mp->retval)); + + if (mp->context != wrk->wrk_index) + VDBG (0, "wrong context"); + + vcl_session_table_del_vpp_handle (wrk, mp->handle); + vcl_session_free (wrk, s); +} + static vcl_session_t * vcl_session_accepted (vcl_worker_t * wrk, session_accepted_msg_t * msg) { @@ -670,6 +694,9 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) case SESSION_CTRL_EVT_BOUND: vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: vcl_session_req_worker_update_handler (wrk, e->data); break; @@ -821,7 +848,6 @@ vppcom_session_unbind (u32 session_handle) return VPPCOM_EBADFD; vpp_handle = session->vpp_handle; - vcl_session_table_del_listener (wrk, vpp_handle); session->vpp_handle = ~0; session->session_state = STATE_DISCONNECT; @@ -1079,6 +1105,7 @@ vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * session, VDBG (0, "session %u [0x%llx]: listener unbind failed! " "rv %d (%s)", session->session_index, vpp_handle, rv, vppcom_retval_str (rv)); + return rv; } else if (state & STATE_OPEN) { @@ -1937,6 +1964,9 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, *bits_set += 1; } break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: vcl_session_worker_update_reply_handler (wrk, e->data); break; @@ -2558,6 +2588,9 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; session_evt_data = session->vep.ev.data.u64; break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: vcl_session_req_worker_update_handler (wrk, e->data); break; |