From 592a909a302262cf4088a5468b8e427f577725e8 Mon Sep 17 00:00:00 2001 From: Carl Smith Date: Tue, 12 Nov 2019 14:57:37 +1300 Subject: vcl: fix nonblocking accept with >1 event in the queue We discard unwanted events until we get an ACCEPTED. But if we are non-blocking we need to check the queue length every time and EAGAIN if empty before waiting. Type: fix Signed-off-by: Carl Smith Change-Id: Ie0c7e5cb00f0d37d2e1534f8bb384221ff56f2e3 --- src/vcl/vppcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/vcl/vppcom.c') diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 349e27e5122..263fa916231 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -1464,11 +1464,11 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, is_nonblocking = VCL_SESS_ATTR_TEST (listen_session->attr, VCL_SESS_ATTR_NONBLOCK); - if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) - return VPPCOM_EAGAIN; - while (1) { + if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) + return VPPCOM_EAGAIN; + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_WAIT, 0)) return VPPCOM_EAGAIN; -- cgit 1.2.3-korg