{
VDBG (0, "ERROR: session index %u: connect failed! %U",
session_index, format_api_error, ntohl (mp->retval));
- session->session_state = STATE_FAILED;
+ session->session_state = STATE_FAILED | STATE_DISCONNECT;
session->vpp_handle = mp->handle;
return session_index;
}
+ session->vpp_handle = mp->handle;
+ session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
+ svm_msg_q_t *);
rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
if (vcl_wait_for_segment (mp->segment_handle))
{
VDBG (0, "segment for session %u couldn't be mounted!",
session->session_index);
- session->session_state = STATE_FAILED;
- return VCL_INVALID_SESSION_INDEX;
+ session->session_state = STATE_FAILED | STATE_DISCONNECT;
+ vcl_send_session_disconnect (wrk, session);
+ return session_index;
}
rx_fifo->client_session_index = session_index;
rx_fifo->client_thread_index = vcl_get_worker_index ();
tx_fifo->client_thread_index = vcl_get_worker_index ();
- session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
- svm_msg_q_t *);
vpp_wrk_index = tx_fifo->master_thread_index;
vec_validate (wrk->vpp_event_queues, vpp_wrk_index);
wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q;
{
VDBG (0, "ct segment for session %u couldn't be mounted!",
session->session_index);
- session->session_state = STATE_FAILED;
- return VCL_INVALID_SESSION_INDEX;
+ session->session_state = STATE_FAILED | STATE_DISCONNECT;
+ vcl_send_session_disconnect (wrk, session);
+ return session_index;
}
}
session->rx_fifo = rx_fifo;
session->tx_fifo = tx_fifo;
- session->vpp_handle = mp->handle;
session->vpp_thread_index = rx_fifo->master_thread_index;
session->transport.is_ip4 = mp->lcl.is_ip4;
clib_memcpy_fast (&session->transport.lcl_ip, &mp->lcl.ip,
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;
}
#define vcl_fifo_rx_evt_valid_or_break(_s) \
+if (PREDICT_FALSE (!_s->rx_fifo)) \
+ break; \
if (PREDICT_FALSE (svm_fifo_is_empty (_s->rx_fifo))) \
{ \
if (!vcl_session_is_ct (_s)) \
break;
case SESSION_CTRL_EVT_CONNECTED:
connected_msg = (session_connected_msg_t *) e->data;
- vcl_session_connected_handler (wrk, connected_msg);
+ sid = vcl_session_connected_handler (wrk, connected_msg);
/* Generate EPOLLOUT because there's no connected event */
- sid = vcl_session_index_from_vpp_handle (wrk, connected_msg->handle);
if (!(session = vcl_session_get (wrk, sid)))
break;
session_events = session->vep.ev.events;
add_event = 1;
events[*num_ev].events |= EPOLLOUT;
session_evt_data = session->vep.ev.data.u64;
+ if (session->session_state & STATE_FAILED)
+ events[*num_ev].events |= EPOLLHUP;
break;
case SESSION_CTRL_EVT_DISCONNECTED:
disconnected_msg = (session_disconnected_msg_t *) e->data;