Type: refactor
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I57fcc6f9c154a6f83e0d59873b76c2e380e6f90a
typedef enum vcl_session_state_
{
VCL_STATE_CLOSED,
typedef enum vcl_session_state_
{
VCL_STATE_CLOSED,
VCL_STATE_VPP_CLOSING,
VCL_STATE_DISCONNECT,
VCL_STATE_DETACHED,
VCL_STATE_VPP_CLOSING,
VCL_STATE_DISCONNECT,
VCL_STATE_DETACHED,
static inline u8
vcl_session_is_ready (vcl_session_t * s)
{
static inline u8
vcl_session_is_ready (vcl_session_t * s)
{
- return (s->session_state == VCL_STATE_ACCEPT
- || s->session_state == VCL_STATE_CONNECT
+ return (s->session_state == VCL_STATE_READY
|| s->session_state == VCL_STATE_VPP_CLOSING);
}
|| s->session_state == VCL_STATE_VPP_CLOSING);
}
case VCL_STATE_CLOSED:
st = "STATE_CLOSED";
break;
case VCL_STATE_CLOSED:
st = "STATE_CLOSED";
break;
- case VCL_STATE_CONNECT:
- st = "STATE_CONNECT";
- break;
case VCL_STATE_LISTEN:
st = "STATE_LISTEN";
break;
case VCL_STATE_LISTEN:
st = "STATE_LISTEN";
break;
- case VCL_STATE_ACCEPT:
- st = "STATE_ACCEPT";
+ case VCL_STATE_READY:
+ st = "STATE_READY";
break;
case VCL_STATE_VPP_CLOSING:
st = "STATE_VPP_CLOSING";
break;
case VCL_STATE_VPP_CLOSING:
st = "STATE_VPP_CLOSING";
session->rx_fifo = rx_fifo;
session->tx_fifo = tx_fifo;
session->rx_fifo = rx_fifo;
session->tx_fifo = tx_fifo;
- session->session_state = VCL_STATE_ACCEPT;
+ session->session_state = VCL_STATE_READY;
session->transport.rmt_port = mp->rmt.port;
session->transport.is_ip4 = mp->rmt.is_ip4;
clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip,
session->transport.rmt_port = mp->rmt.port;
session->transport.is_ip4 = mp->rmt.is_ip4;
clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip,
&& session->session_state == VCL_STATE_CLOSED)
vcl_send_session_disconnect (wrk, session);
else
&& session->session_state == VCL_STATE_CLOSED)
vcl_send_session_disconnect (wrk, session);
else
- session->session_state = VCL_STATE_CONNECT;
+ session->session_state = VCL_STATE_READY;
/* Add it to lookup table */
vcl_session_table_add_vpp_handle (wrk, mp->handle, session_index);
/* Add it to lookup table */
vcl_session_table_add_vpp_handle (wrk, mp->handle, session_index);
{
return VPPCOM_EBADFD;
}
{
return VPPCOM_EBADFD;
}
- if (session->session_state & state)
+ if (session->session_state == state)
if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK))
{
/* State set to STATE_UPDATED to ensure the session is not assumed
if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK))
{
/* State set to STATE_UPDATED to ensure the session is not assumed
- * to be open and to also allow the app to close it prior to vpp's
+ * to be ready and to also allow the app to close it prior to vpp's
* connected reply. */
session->session_state = VCL_STATE_UPDATED;
return VPPCOM_EINPROGRESS;
* connected reply. */
session->session_state = VCL_STATE_UPDATED;
return VPPCOM_EINPROGRESS;
/*
* Wait for reply from vpp if blocking
*/
/*
* Wait for reply from vpp if blocking
*/
- rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_CONNECT,
+ rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY,
vcm->cfg.session_timeout);
session = vcl_session_get (wrk, session_index);
vcm->cfg.session_timeout);
session = vcl_session_get (wrk, session_index);
* Send connect request and wait for reply from vpp
*/
vcl_send_session_connect (wrk, session);
* Send connect request and wait for reply from vpp
*/
vcl_send_session_connect (wrk, session);
- rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_CONNECT,
+ rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY,
vcm->cfg.session_timeout);
session->listener_index = parent_session_index;
vcm->cfg.session_timeout);
session->listener_index = parent_session_index;