diff options
Diffstat (limited to 'src/vcl')
| -rw-r--r-- | src/vcl/vcl_private.c | 4 | ||||
| -rw-r--r-- | src/vcl/vcl_private.h | 4 | ||||
| -rw-r--r-- | src/vcl/vppcom.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/vcl/vcl_private.c b/src/vcl/vcl_private.c index 5f9ce270508..6c364e376f7 100644 --- a/src/vcl/vcl_private.c +++ b/src/vcl/vcl_private.c @@ -404,7 +404,7 @@ vcl_session_read_ready (vcl_session_t * session) if (PREDICT_FALSE (!(session->session_state & (STATE_OPEN | STATE_LISTEN)))) { - session_state_t state = session->session_state; + vcl_session_state_t state = session->session_state; int rv; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); @@ -442,7 +442,7 @@ vcl_session_write_ready (vcl_session_t * session) if (PREDICT_FALSE (!(session->session_state & STATE_OPEN))) { - session_state_t state = session->session_state; + vcl_session_state_t state = session->session_state; int rv; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 39c9e7207c7..d55ecd4c72d 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -72,7 +72,7 @@ typedef enum STATE_FAILED = 0x20, STATE_UPDATED = 0x40, STATE_LISTEN_NO_MQ = 0x80, -} session_state_t; +} vcl_session_state_t; #define SERVER_STATE_OPEN (STATE_ACCEPT|STATE_VPP_CLOSING) #define CLIENT_STATE_OPEN (STATE_CONNECT|STATE_VPP_CLOSING) @@ -496,7 +496,7 @@ vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 listener_handle) return session; } -const char *vppcom_session_state_str (session_state_t state); +const char *vppcom_session_state_str (vcl_session_state_t state); static inline u8 vcl_session_is_ct (vcl_session_t * s) diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 3c3e15d146c..eecb2f48ce2 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -60,7 +60,7 @@ vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) } const char * -vppcom_session_state_str (session_state_t state) +vppcom_session_state_str (vcl_session_state_t state) { char *st; @@ -684,7 +684,7 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) static int vppcom_wait_for_session_state_change (u32 session_index, - session_state_t state, + vcl_session_state_t state, f64 wait_for_time) { vcl_worker_t *wrk = vcl_worker_get_current (); @@ -730,7 +730,7 @@ vppcom_wait_for_session_state_change (u32 session_index, static void vcl_handle_pending_wrk_updates (vcl_worker_t * wrk) { - session_state_t state; + vcl_session_state_t state; vcl_session_t *s; u32 *sip; @@ -840,7 +840,7 @@ vppcom_session_disconnect (u32 session_handle) vcl_worker_t *wrk = vcl_worker_get_current (); svm_msg_q_t *vpp_evt_q; vcl_session_t *session; - session_state_t state; + vcl_session_state_t state; u64 vpp_handle; session = vcl_session_get_w_handle (wrk, session_handle); @@ -1027,7 +1027,7 @@ int vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * session, vcl_session_handle_t sh, u8 do_disconnect) { - session_state_t state; + vcl_session_state_t state; u32 next_sh, vep_sh; int rv = VPPCOM_OK; u64 vpp_handle; |