{
vcm->error_string_by_error_number = hash_create (0, sizeof (uword));
-#define _(n,v,s) hash_set (vcm->error_string_by_error_number, -v, s);
+#define _(n, v, s) hash_set (vcm->error_string_by_error_number, -v, s);
foreach_vnet_api_error;
#undef _
clib_spinlock_unlock (&vcm->sessions_lockp);
return rv;
}
- if (session->state == state)
+ if (session->state & state)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
return VPPCOM_OK;
}
- if (session->state == STATE_FAILED)
+ if (session->state & STATE_FAILED)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
return VPPCOM_ECONNREFUSED;
u32 session_index;
svm_fifo_t *rx_fifo, *tx_fifo;
u8 is_cut_thru = 0;
- int rv;
+ int rv = VPPCOM_OK;
session_index = mp->context;
VCL_LOCK_AND_GET_SESSION (session_index, &session);
"connect failed! %U",
getpid (), mp->handle, session_index,
format_api_error, ntohl (mp->retval));
- if (rv == VPPCOM_OK)
+ if (session)
{
session->state = STATE_FAILED;
session->vpp_handle = mp->handle;
if (session->peer_addr.is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format =
static void
vppcom_api_hookup (void)
{
-#define _(N,n) \
+#define _(N, n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \
vl_api_##n##_t_handler, \
vl_noop_handler, \
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured namespace_id (%v) from "
- VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (),
- vcm->cfg.namespace_id);
+ VPPCOM_ENV_APP_NAMESPACE_ID
+ "!", getpid (), vcm->cfg.namespace_id);
}
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
if (env_var_str)
vcm->cfg.namespace_secret = tmp;
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured namespace secret "
- "(%lu) from " VPPCOM_ENV_APP_NAMESPACE_ID "!",
- getpid (), vcm->cfg.namespace_secret);
+ "(%lu) from "
+ VPPCOM_ENV_APP_NAMESPACE_ID
+ "!", getpid (), vcm->cfg.namespace_secret);
}
}
if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP))
vcm->cfg.app_proxy_transport_tcp = 1;
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured app_proxy_transport_tcp "
- "(%u) from " VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP
+ "(%u) from "
+ VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP
"!", getpid (), vcm->cfg.app_proxy_transport_tcp);
}
if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP))
vcm->cfg.app_proxy_transport_udp = 1;
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured app_proxy_transport_udp "
- "(%u) from " VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP
+ "(%u) from "
+ VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP
"!", getpid (), vcm->cfg.app_proxy_transport_udp);
}
if (getenv (VPPCOM_ENV_APP_SCOPE_LOCAL))
vcm->cfg.app_scope_local = 1;
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured app_scope_local (%u) from "
- VPPCOM_ENV_APP_SCOPE_LOCAL "!", getpid (),
- vcm->cfg.app_scope_local);
+ VPPCOM_ENV_APP_SCOPE_LOCAL
+ "!", getpid (), vcm->cfg.app_scope_local);
}
if (getenv (VPPCOM_ENV_APP_SCOPE_GLOBAL))
{
vcm->cfg.app_scope_global = 1;
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: configured app_scope_global (%u) from "
- VPPCOM_ENV_APP_SCOPE_GLOBAL "!", getpid (),
- vcm->cfg.app_scope_global);
+ VPPCOM_ENV_APP_SCOPE_GLOBAL
+ "!", getpid (), vcm->cfg.app_scope_global);
}
vcm->main_cpu = os_get_thread_index ();
if (is_listen)
{
- if (state == STATE_LISTEN)
+ if (state & STATE_LISTEN)
{
rv = vppcom_session_unbind (session_index);
if (PREDICT_FALSE (rv < 0))
{
if (session->lcl_addr.is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "bind local:%s:%d.%d.%d.%d:%d ",
if (client_session->lcl_addr.is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e2) =
{
.format = "accept cut-thru: S:%d %d.%d.%d.%d:%d ",
if (PREDICT_FALSE (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- rv = ((state == STATE_DISCONNECT) ?
- VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
+ rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
if (VPPCOM_DEBUG > 0)
clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s session is "
if (poll_et)
session->vep.et_mask |= EPOLLIN;
- if (state == STATE_CLOSE_ON_EMPTY)
+ if (state & STATE_CLOSE_ON_EMPTY)
{
session_state_t new_state = STATE_DISCONNECT;
rv = VPPCOM_ECONNRESET;
{
if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN | STATE_LISTEN)))
{
- rv = ((state == STATE_DISCONNECT) ? VPPCOM_ECONNRESET :
+ rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET :
VPPCOM_ENOTCONN);
if (VPPCOM_DEBUG > 1)
if (poll_et)
session->vep.et_mask |= EPOLLIN;
- if (state == STATE_CLOSE_ON_EMPTY)
+ if (state & STATE_CLOSE_ON_EMPTY)
{
rv = VPPCOM_ECONNRESET;
session_state_t new_state = STATE_DISCONNECT;
state = session->state;
if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))
{
- rv = ((state == STATE_DISCONNECT) ? VPPCOM_ECONNRESET :
- VPPCOM_ENOTCONN);
+ rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
if (poll_et)
session->vep.et_mask |= EPOLLOUT;
- if (state == STATE_CLOSE_ON_EMPTY)
+ if (state & STATE_CLOSE_ON_EMPTY)
{
session_state_t new_state = STATE_DISCONNECT;
rv = VPPCOM_ECONNRESET;
{
session_state_t state = session->state;
- rv = ((state == STATE_DISCONNECT) ? VPPCOM_ECONNRESET :
- VPPCOM_ENOTCONN);
+ rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"%s session is not open! state 0x%x (%s), "
if (poll_et)
session->vep.et_mask |= EPOLLOUT;
- if (state == STATE_CLOSE_ON_EMPTY)
+ if (state & STATE_CLOSE_ON_EMPTY)
{
rv = VPPCOM_ECONNRESET;
session_state_t new_state = STATE_DISCONNECT;
event->events, event->data.u64);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "epoll_ctladd: events:%x data:%x",
getpid (), vep_idx, session_index);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "epoll_ctldel: vep:%d",
getpid (), vep_idx);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "WRN: vep_idx:%d empty",
getpid (), vep_idx);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "ERR:vep_idx:%d is vep",
"a vep session!", getpid (), sid);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "ERR:SID:%d not vep",
getpid (), rv);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_NREAD: nread=%d",
getpid (), session_index, rv);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_NWRITE: nwrite=%d",
session_index, *flags, session->is_nonblocking);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_FLAGS: flags=%x is_nonblk=%d",
session->is_nonblocking);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_FLAGS: flags=%x is_nonblk=%d",
{
if (ep->is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:%d.%d.%d.%d:%d",
}
else
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:IP6:%d",
{
if (ep->is_ip4)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:%d.%d.%d.%d:%d",
}
else
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:IP6:%d",
getpid (), rv);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd=%s%d buflen=%d",
*(int *) buffer ? "UDP" : "TCP", *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_PROTOCOL: %s buflen=%d",
"buflen %d", getpid (), *(int *) buffer, *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_LISTEN: %d buflen=%d",
*(int *) buffer, *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_ERROR: %d buflen=%d",
*(size_t *) buffer, *(size_t *) buffer, *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_TX_FIFO_LEN: 0x%x buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_TX_FIFO_LEN: 0x%x buflen=%d",
*(size_t *) buffer, *(size_t *) buffer, *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_RX_FIFO_LEN: 0x%x buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_RX_FIFO_LEN: 0x%x buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_REUSEADDR: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_REUSEADDR: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_REUSEPORT: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_REUSEPORT: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_BROADCAST: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_BROADCAST: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_V6ONLY: %d buflen=%d",
VCL_SESS_ATTR_V6ONLY), *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_V6ONLY: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_KEEPALIVE: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_KEEPALIVE: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_TCP_NODELAY: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_TCP_NODELAY: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d buflen=%d",
*buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_GET_TCP_USER_MSS: %d buflen=%d",
session->user_mss, *buflen);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "VPPCOM_ATTR_SET_TCP_USER_MSS: %d buflen=%d",
getpid (), session_index);
if (VPPCOM_DEBUG > 0)
{
- /* *INDENT-OFF* */
+ /* *INDENT-OFF* */
ELOG_TYPE_DECLARE (e) =
{
.format = "invalid session: %d closed",