ip46_address_t ip46;
} vppcom_ip46_t;
+enum
+{
+ VCL_SESS_ATTR_SERVER,
+ VCL_SESS_ATTR_CUT_THRU,
+ VCL_SESS_ATTR_VEP,
+ VCL_SESS_ATTR_VEP_SESSION,
+ VCL_SESS_ATTR_LISTEN, // SOL_SOCKET,SO_ACCEPTCONN
+ VCL_SESS_ATTR_NONBLOCK, // fcntl,O_NONBLOCK
+ VCL_SESS_ATTR_REUSEADDR, // SOL_SOCKET,SO_REUSEADDR
+ VCL_SESS_ATTR_REUSEPORT, // SOL_SOCKET,SO_REUSEPORT
+ VCL_SESS_ATTR_BROADCAST, // SOL_SOCKET,SO_BROADCAST
+ VCL_SESS_ATTR_V6ONLY, // SOL_TCP,IPV6_V6ONLY
+ VCL_SESS_ATTR_KEEPALIVE, // SOL_SOCKET,SO_KEEPALIVE
+ VCL_SESS_ATTR_TCP_NODELAY, // SOL_TCP,TCP_NODELAY
+ VCL_SESS_ATTR_TCP_KEEPIDLE, // SOL_TCP,TCP_KEEPIDLE
+ VCL_SESS_ATTR_TCP_KEEPINTVL, // SOL_TCP,TCP_KEEPINTVL
+ VCL_SESS_ATTR_MAX
+} vppcom_session_attr_t;
+
+#define VCL_SESS_ATTR_SET(ATTR, VAL) \
+do { \
+ (ATTR) |= 1 << (VAL); \
+ } while (0)
+
+#define VCL_SESS_ATTR_CLR(ATTR, VAL) \
+do { \
+ (ATTR) &= ~(1 << (VAL)); \
+ } while (0)
+
+#define VCL_SESS_ATTR_TEST(ATTR, VAL) \
+ ((ATTR) & (1 << (VAL)) ? 1 : 0)
+
typedef struct
{
volatile session_state_t state;
svm_fifo_t *server_rx_fifo;
svm_fifo_t *server_tx_fifo;
+ u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF)
+ u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF)
+ u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG)
u8 *segment_name;
u32 sm_seg_index;
u32 client_context;
svm_queue_t *vpp_event_queue;
/* Socket configuration state */
- /* TBD: covert 'is_*' vars to bit in u8 flags; */
+ /* TBD: covert 'is_*' vars to bit in session->attr; */
u8 is_server;
u8 is_listen;
u8 is_cut_thru;
u8 is_nonblocking;
u8 is_vep;
u8 is_vep_session;
+ u32 attr;
u32 wait_cont_idx;
vppcom_epoll_t vep;
+ int libc_epfd;
u32 vrf;
vppcom_ip46_t lcl_addr;
vppcom_ip46_t peer_addr;
static vppcom_main_t *vcm = &_vppcom_main;
-#define VCL_LOCK_AND_GET_SESSION(I, S) \
-do { \
- clib_spinlock_lock (&vcm->sessions_lockp); \
- rv = vppcom_session_at_index (I, S); \
- if (PREDICT_FALSE (rv)) \
- { \
- clib_spinlock_unlock (&vcm->sessions_lockp); \
- clib_warning ("[%s] ERROR: Invalid ##I (%u)!", \
- getpid (), I); \
- goto done; \
- } \
+#define VCL_LOCK_AND_GET_SESSION(I, S) \
+do { \
+ clib_spinlock_lock (&vcm->sessions_lockp); \
+ rv = vppcom_session_at_index (I, S); \
+ if (PREDICT_FALSE (rv)) \
+ { \
+ clib_spinlock_unlock (&vcm->sessions_lockp); \
+ clib_warning ("VCL<%d>: ERROR: Invalid ##I (%u)!", \
+ getpid (), I); \
+ goto done; \
+ } \
} while (0)
static const char *
if (PREDICT_FALSE ((session_index == ~0) ||
pool_is_free_index (vcm->sessions, session_index)))
{
- clib_warning ("[%d] invalid session, sid (%u) has been closed!",
+ clib_warning ("VCL<%d>: invalid session, sid (%u) has been closed!",
getpid (), session_index);
return VPPCOM_EBADFD;
}
p = hash_get (vcm->session_index_by_vpp_handles, handle);
if (!p)
{
- clib_warning ("[%d] couldn't find listen session: unknown vpp "
+ clib_warning ("VCL<%d>: couldn't find listen session: unknown vpp "
"listener handle %llx", getpid (), listener_handle);
return 0;
}
if (pool_is_free_index (vcm->sessions, p[0]))
{
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid listen session, sid (%u)", getpid (),
- p[0]);
+ clib_warning ("VCL<%d>: invalid listen session, sid (%u)",
+ getpid (), p[0]);
return 0;
}
int rv = VPPCOM_OK;
if (VPPCOM_DEBUG > 0)
- printf ("\nConnecting to VPP api...");
+ clib_warning ("VCL<%d>: app (%s) connecting to VPP api...",
+ getpid (), app_name);
+
if (vl_client_connect_to_vlib ("/vpe-api", app_name,
vcm->cfg.vpp_api_q_length) < 0)
{
- clib_warning ("[%d] connect to vpp (%s) failed!", getpid (), app_name);
+ clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name);
rv = VPPCOM_ECONNREFUSED;
}
else
{
-
vcm->vl_input_queue = am->shmem_hdr->vl_input_queue;
vcm->my_client_index = am->my_client_index;
vcm->app_state = STATE_APP_CONN_VPP;
-
- if (VPPCOM_DEBUG > 0)
- printf (" connected!\n");
}
if (VPPCOM_DEBUG > 0)
/* *INDENT-ON* */
}
+ clib_warning ("VCL<%d>: app (%s) is connected to VPP!",
+ getpid (), app_name);
return rv;
}
return VPPCOM_OK;
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] timeout waiting for state %s (%d)", getpid (),
+ clib_warning ("VCL<%d>: timeout waiting for state %s (%d)", getpid (),
vppcom_app_state_str (app_state), app_state);
if (VPPCOM_DEBUG > 0)
while (clib_time_now (&vcm->clib_time) < timeout);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] timeout waiting for state 0x%x (%s)", getpid (),
+ clib_warning ("VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (),
state, vppcom_session_state_str (state));
if (VPPCOM_DEBUG > 0)
return VPPCOM_EAGAIN;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] timeout waiting for client_session_index", getpid ());
+ clib_warning ("VCL<%d>: timeout waiting for client_session_index",
+ getpid ());
if (VPPCOM_DEBUG > 0)
{
if (PREDICT_FALSE (rv))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] application session enable timed out! "
+ clib_warning ("VCL<%d>: application session enable timed out! "
"returning %d (%s)",
getpid (), rv, vppcom_retval_str (rv));
return rv;
{
if (mp->retval)
{
- clib_warning ("[%d] session_enable_disable failed: %U", getpid (),
+ clib_warning ("VCL<%d>: session_enable_disable failed: %U", getpid (),
format_api_error, ntohl (mp->retval));
}
else
if (PREDICT_FALSE (rv))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] application attach timed out! returning %d (%s)",
+ clib_warning ("VCL<%d>: application attach timed out! "
+ "returning %d (%s)",
getpid (), rv, vppcom_retval_str (rv));
return rv;
}
memset (a, 0, sizeof (*a));
if (mp->retval)
{
- clib_warning ("[%d] attach failed: %U", getpid (),
+ clib_warning ("VCL<%d>: attach failed: %U", getpid (),
format_api_error, ntohl (mp->retval));
return;
}
if (mp->segment_name_length == 0)
{
- clib_warning ("[%d] segment_name_length zero", getpid ());
+ clib_warning ("VCL<%d>: segment_name_length zero", getpid ());
return;
}
vec_reset_length (a->new_segment_indices);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] svm_fifo_segment_attach ('%s') failed", getpid (),
- mp->segment_name);
+ clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
+ getpid (), mp->segment_name);
return;
}
mp)
{
if (mp->retval)
- clib_warning ("[%d] detach failed: %U", getpid (), format_api_error,
+ clib_warning ("VCL<%d>: detach failed: %U", getpid (), format_api_error,
ntohl (mp->retval));
vcm->app_state = STATE_APP_ENABLED;
mp)
{
if (mp->retval)
- clib_warning ("[%d] vpp handle 0x%llx: disconnect session failed: %U",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx: disconnect session failed: %U",
getpid (), mp->handle, format_api_error,
ntohl (mp->retval));
}
vec_reset_length (a->new_segment_indices);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] svm_fifo_segment_attach ('%s') failed",
+ clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
getpid (), mp->segment_name);
return;
}
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] mapped new segment '%s' size %d", getpid (),
+ clib_warning ("VCL<%d>: mapped new segment '%s' size %d", getpid (),
mp->segment_name, mp->segment_size);
}
session->state = STATE_CLOSE_ON_EMPTY;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"setting state to 0x%x (%s)",
getpid (), mp->handle, session_index, session->state,
vppcom_session_state_str (session->state));
done:
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"session lookup failed!",
getpid (), mp->handle, session_index);
}
else
- clib_warning ("[%d] vpp handle 0x%llx: session lookup by "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx: session lookup by "
"handle failed!", getpid (), mp->handle);
}
if (PREDICT_FALSE (rval))
{
rv = VNET_API_ERROR_INVALID_VALUE_2;
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"session lookup failed! returning %d %U",
getpid (), mp->handle, p[0],
rv, format_api_error, rv);
session->state = STATE_CLOSE_ON_EMPTY;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"state set to %d (%s)!", getpid (),
mp->handle, p[0], session->state,
vppcom_session_state_str (session->state));
else
{
rv = VNET_API_ERROR_INVALID_VALUE;
- clib_warning ("[%d] ERROR: vpp handle 0x%llx: session lookup "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx: session lookup "
"failed! returning %d %U",
getpid (), mp->handle, rv, format_api_error, rv);
}
done:
if (mp->retval)
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"connect failed! %U",
getpid (), mp->handle, session_index,
format_api_error, ntohl (mp->retval));
memset (a, 0, sizeof (*a));
a->segment_name = (char *) mp->segment_name;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] cut-thru segment: %s\n",
+ clib_warning ("VCL<%d>: cut-thru segment: %s\n",
getpid (), a->segment_name);
rv = svm_fifo_segment_attach (a);
vec_reset_length (a->new_segment_indices);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] sm_fifo_segment_attach ('%s') failed",
+ clib_warning ("VCL<%d>: sm_fifo_segment_attach ('%s') failed",
getpid (), a->segment_name);
goto done_unlock;
}
hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: connect succeeded!"
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded!"
" session_rx_fifo %p, refcnt %d,"
" session_tx_fifo %p, refcnt %d",
getpid (), mp->handle, session_index,
vl_api_disconnect_session_reply_t *rmp;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: sending disconnect msg",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "sending disconnect msg",
getpid (), vpp_handle, session_index);
rmp = vl_msg_api_alloc (sizeof (*rmp));
vl_api_disconnect_session_t *dmp;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: sending disconnect msg",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "sending disconnect msg",
getpid (), vpp_handle, session_index);
dmp = vl_msg_api_alloc (sizeof (*dmp));
done:
if (mp->retval)
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: bind failed: %U",
- getpid (), mp->handle, session_index, format_api_error,
- ntohl (mp->retval));
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, "
+ "sid %u: bind failed: %U",
+ getpid (), mp->handle, session_index,
+ format_api_error, ntohl (mp->retval));
rv = vppcom_session_at_index (session_index, &session);
if (rv == VPPCOM_OK)
{
session->state = STATE_LISTEN;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: bind succeeded!",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!",
getpid (), mp->handle, mp->context);
done_unlock:
clib_spinlock_unlock (&vcm->sessions_lockp);
vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp)
{
if (mp->retval)
- clib_warning ("[%d] ERROR: sid %u: unbind failed: %U",
+ clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U",
getpid (), mp->context, format_api_error,
ntohl (mp->retval));
else if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] sid %u: unbind succeeded!", getpid (), mp->context);
+ clib_warning ("VCL<%d>: sid %u: unbind succeeded!",
+ getpid (), mp->context);
}
u8 *
clib_spinlock_lock (&vcm->sessions_lockp);
if (!clib_fifo_free_elts (vcm->client_session_index_fifo))
{
- clib_warning ("[%d] client session queue is full!", getpid ());
+ clib_warning ("VCL<%d>: client session queue is full!", getpid ());
vppcom_send_accept_session_reply (mp->handle, mp->context,
VNET_API_ERROR_QUEUE_FULL);
clib_spinlock_unlock (&vcm->sessions_lockp);
listen_session = vppcom_session_table_lookup_listener (mp->listener_handle);
if (!listen_session)
{
- clib_warning ("[%d] ERROR: couldn't find listen session: unknown vpp "
- "listener handle %llx", getpid (), mp->listener_handle);
+ clib_warning ("VCL<%d>: ERROR: couldn't find listen session: "
+ "unknown vpp listener handle %llx",
+ getpid (), mp->listener_handle);
clib_spinlock_unlock (&vcm->sessions_lockp);
return;
}
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: client accept "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client accept "
"request from %s address %U port %d queue %p!", getpid (),
mp->handle, session_index, mp->is_ip4 ? "IPv4" : "IPv6",
format_ip46_address, &mp->ip, mp->is_ip4,
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] client session queue is full!", getpid ());
+ clib_warning ("VCL<%d>: client session queue is full!", getpid ());
/* TBD: Fix api to include vpp handle */
vppcom_send_connect_session_reply (0 /* session */ , 0 /* sid */ ,
session->state = STATE_ACCEPT;
clib_fifo_add1 (vcm->client_session_index_fifo, session_index);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] sid %u: Got a cut-thru connect request! "
+ clib_warning ("VCL<%d>: sid %u: Got a cut-thru connect request! "
"clib_fifo_elts %u!\n", getpid (), session_index,
clib_fifo_elts (vcm->client_session_index_fifo));
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"sending unbind msg! new state 0x%x (%s)",
getpid (), vpp_handle, session_index,
session->state, vppcom_session_state_str (session->state));
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: %s state 0x%x (%s), "
- "is_cut_thru %d, is_listen %d",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s "
+ "state 0x%x (%s), is_cut_thru %d, is_listen %d",
getpid (), vpp_handle, session_index,
is_server ? "server" : "client",
state, vppcom_session_state_str (state),
if (PREDICT_FALSE (is_listen))
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"Cannot disconnect a listen socket!",
getpid (), vpp_handle, session_index);
rv = VPPCOM_EBADFD;
vppcom_send_disconnect_session_reply (vpp_handle,
session_index, 0 /* rv */ );
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"sending disconnect REPLY...",
getpid (), vpp_handle, session_index);
}
else
{
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"sending disconnect...",
getpid (), vpp_handle, session_index);
VCL_LOCK_AND_GET_SESSION (session_index, &session);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] sid %d: freeing cut-thru fifos in "
+ clib_warning ("VCL<%d>: sid %d: freeing cut-thru fifos in "
"sm_seg_index %d! "
" server_rx_fifo %p, refcnt = %d"
" server_tx_fifo %p, refcnt = %d",
if (size == 0)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] parse error '%s %s', "
+ clib_warning ("VCL<%d>: parse error '%s %s', "
"using default heapsize %lld (0x%llx)",
getpid (), argv[i], argv[i + 1],
vcl_cfg->heapsize, vcl_cfg->heapsize);
else
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] parse error '%s %s', "
+ clib_warning ("VCL<%d>: parse error '%s %s', "
"using default heapsize %lld (0x%llx)",
getpid (), argv[i], argv[i + 1],
vcl_cfg->heapsize, vcl_cfg->heapsize);
MAP_SHARED | MAP_ANONYMOUS, -1, 0);
if (vcl_mem == MAP_FAILED)
{
- clib_unix_error ("[%d] ERROR: mmap(0, %lld == 0x%llx, "
+ clib_unix_error ("VCL<%d>: ERROR: mmap(0, %lld == 0x%llx, "
"PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, "
"-1, 0) failed!",
getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
heap = clib_mem_init (vcl_mem, vcl_cfg->heapsize);
if (!heap)
{
- clib_warning ("[%d] ERROR: clib_mem_init() failed!", getpid ());
+ clib_warning ("VCL<%d>: ERROR: clib_mem_init() failed!", getpid ());
return;
}
vcl_mem = clib_mem_alloc (sizeof (_vppcom_main));
if (!vcl_mem)
{
- clib_warning ("[%d] ERROR: clib_mem_alloc() failed!", getpid ());
+ clib_warning ("VCL<%d>: ERROR: clib_mem_alloc() failed!", getpid ());
return;
}
vcm = vcl_mem;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] allocated VCL heap = %p, size %lld (0x%llx)",
+ clib_warning ("VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)",
getpid (), heap, vcl_cfg->heapsize, vcl_cfg->heapsize);
}
if (fd < 0)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] open configuration file '%s' failed!",
+ clib_warning ("VCL<%d>: open configuration file '%s' failed!",
getpid (), conf_fname);
goto file_done;
}
if (fstat (fd, &s) < 0)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] failed to stat `%s'", getpid (), conf_fname);
+ clib_warning ("VCL<%d>: failed to stat `%s'", getpid (), conf_fname);
goto file_done;
}
if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] not a regular file `%s'", getpid (), conf_fname);
+ clib_warning ("VCL<%d>: not a regular file `%s'",
+ getpid (), conf_fname);
goto file_done;
}
{
vec_terminate_c_string (chroot_path);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured heapsize %s, "
+ clib_warning ("VCL<%d>: configured heapsize %s, "
"actual heapsize %lld (0x%llx)",
getpid (), chroot_path, vcl_cfg->heapsize,
vcl_cfg->heapsize);
vec_terminate_c_string (chroot_path);
vl_set_memory_root_path ((char *) chroot_path);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured api-prefix %s",
+ clib_warning ("VCL<%d>: configured api-prefix %s",
getpid (), chroot_path);
chroot_path = 0; /* Don't vec_free() it! */
}
{
if (q_len < vcl_cfg->vpp_api_q_length)
{
- clib_warning ("[%d] ERROR: configured vpp-api-q-length "
+ clib_warning ("VCL<%d>: ERROR: configured vpp-api-q-length "
"(%u) is too small! Using default: %u ",
getpid (), q_len, vcl_cfg->vpp_api_q_length);
}
vcl_cfg->vpp_api_q_length = q_len;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured vpp-api-q-length %u",
+ clib_warning ("VCL<%d>: configured vpp-api-q-length %u",
getpid (), vcl_cfg->vpp_api_q_length);
}
}
{
vl_set_memory_uid (uid);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured uid %d", getpid (), uid);
+ clib_warning ("VCL<%d>: configured uid %d", getpid (), uid);
}
else if (unformat (line_input, "gid %d", &gid))
{
vl_set_memory_gid (gid);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured gid %d", getpid (), gid);
+ clib_warning ("VCL<%d>: configured gid %d", getpid (), gid);
}
else if (unformat (line_input, "segment-baseva 0x%lx",
&vcl_cfg->segment_baseva))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured segment_baseva 0x%lx",
+ clib_warning ("VCL<%d>: configured segment_baseva 0x%lx",
getpid (), vcl_cfg->segment_baseva);
}
else if (unformat (line_input, "segment-size 0x%lx",
&vcl_cfg->segment_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured segment_size 0x%lx (%ld)",
+ clib_warning ("VCL<%d>: configured segment_size 0x%lx (%ld)",
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
&vcl_cfg->segment_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured segment_size %ld (0x%lx)",
+ clib_warning ("VCL<%d>: configured segment_size %ld (0x%lx)",
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
{
if (VPPCOM_DEBUG > 0)
clib_warning
- ("[%d] configured add_segment_size 0x%lx (%ld)",
+ ("VCL<%d>: configured add_segment_size 0x%lx (%ld)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
{
if (VPPCOM_DEBUG > 0)
clib_warning
- ("[%d] configured add_segment_size %ld (0x%lx)",
+ ("VCL<%d>: configured add_segment_size %ld (0x%lx)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
&vcl_cfg->preallocated_fifo_pairs))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured preallocated_fifo_pairs "
+ clib_warning ("VCL<%d>: configured preallocated_fifo_pairs "
"%d (0x%x)", getpid (),
vcl_cfg->preallocated_fifo_pairs,
vcl_cfg->preallocated_fifo_pairs);
&vcl_cfg->rx_fifo_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured rx_fifo_size 0x%lx (%ld)",
+ clib_warning ("VCL<%d>: configured rx_fifo_size 0x%lx (%ld)",
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
&vcl_cfg->rx_fifo_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured rx_fifo_size %ld (0x%lx)",
+ clib_warning ("VCL<%d>: configured rx_fifo_size %ld (0x%lx)",
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
&vcl_cfg->tx_fifo_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured tx_fifo_size 0x%lx (%ld)",
+ clib_warning ("VCL<%d>: configured tx_fifo_size 0x%lx (%ld)",
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
&vcl_cfg->tx_fifo_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured tx_fifo_size %ld (0x%lx)",
+ clib_warning ("VCL<%d>: configured tx_fifo_size %ld (0x%lx)",
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
&vcl_cfg->event_queue_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured event_queue_size 0x%lx (%ld)",
+ clib_warning ("VCL<%d>: configured event_queue_size "
+ "0x%lx (%ld)",
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
&vcl_cfg->event_queue_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured event_queue_size %ld (0x%lx)",
+ clib_warning ("VCL<%d>: configured event_queue_size "
+ "%ld (0x%lx)",
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
&vcl_cfg->listen_queue_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured listen_queue_size 0x%lx (%ld)",
+ clib_warning ("VCL<%d>: configured listen_queue_size "
+ "0x%lx (%ld)",
getpid (), vcl_cfg->listen_queue_size,
vcl_cfg->listen_queue_size);
}
&vcl_cfg->listen_queue_size))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured listen_queue_size %ld (0x%lx)",
+ clib_warning ("VCL<%d>: configured listen_queue_size "
+ "%ld (0x%lx)",
getpid (), vcl_cfg->listen_queue_size,
vcl_cfg->listen_queue_size);
}
&vcl_cfg->app_timeout))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_timeout %f",
+ clib_warning ("VCL<%d>: configured app_timeout %f",
getpid (), vcl_cfg->app_timeout);
}
else if (unformat (line_input, "session-timeout %f",
&vcl_cfg->session_timeout))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured session_timeout %f",
+ clib_warning ("VCL<%d>: configured session_timeout %f",
getpid (), vcl_cfg->session_timeout);
}
else if (unformat (line_input, "accept-timeout %f",
&vcl_cfg->accept_timeout))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured accept_timeout %f",
+ clib_warning ("VCL<%d>: configured accept_timeout %f",
getpid (), vcl_cfg->accept_timeout);
}
else if (unformat (line_input, "app-proxy-transport-tcp"))
{
vcl_cfg->app_proxy_transport_tcp = 1;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_proxy_transport_tcp (%d)",
+ clib_warning ("VCL<%d>: configured "
+ "app_proxy_transport_tcp (%d)",
getpid (), vcl_cfg->app_proxy_transport_tcp);
}
else if (unformat (line_input, "app-proxy-transport-udp"))
{
vcl_cfg->app_proxy_transport_udp = 1;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_proxy_transport_udp (%d)",
+ clib_warning ("VCL<%d>: configured "
+ "app_proxy_transport_udp (%d)",
getpid (), vcl_cfg->app_proxy_transport_udp);
}
else if (unformat (line_input, "app-scope-local"))
{
vcl_cfg->app_scope_local = 1;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_scope_local (%d)",
+ clib_warning ("VCL<%d>: configured app_scope_local (%d)",
getpid (), vcl_cfg->app_scope_local);
}
else if (unformat (line_input, "app-scope-global"))
{
vcl_cfg->app_scope_global = 1;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_scope_global (%d)",
+ clib_warning ("VCL<%d>: configured app_scope_global (%d)",
getpid (), vcl_cfg->app_scope_global);
}
else if (unformat (line_input, "namespace-secret %lu",
{
if (VPPCOM_DEBUG > 0)
clib_warning
- ("[%d] configured namespace_secret %lu (0x%lx)",
+ ("VCL<%d>: configured namespace_secret %lu (0x%lx)",
getpid (), vcl_cfg->namespace_secret,
vcl_cfg->namespace_secret);
}
{
_vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured namespace_id is too long,"
- " truncated to %d characters!", getpid (),
- max_nsid_vec_len);
+ clib_warning ("VCL<%d>: configured namespace_id is "
+ "too long, truncated to %d characters!",
+ getpid (), max_nsid_vec_len);
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured namespace_id %v",
+ clib_warning ("VCL<%d>: configured namespace_id %v",
getpid (), vcl_cfg->namespace_id);
}
else if (unformat (line_input, "}"))
{
vc_cfg_input = 0;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] completed parsing vppcom config!",
+ clib_warning ("VCL<%d>: completed parsing vppcom config!",
getpid ());
goto input_done;
}
{
if (line_input->buffer[line_input->index] != '#')
{
- clib_warning ("[%d] Unknown vppcom config option: '%s'",
+ clib_warning ("VCL<%d>: Unknown vppcom config option: '%s'",
getpid (), (char *)
&line_input->buffer[line_input->index]);
}
{
u32 tmp;
if (sscanf (env_var_str, "%u", &tmp) != 1)
- clib_warning ("[%d] Invalid debug level specified in "
+ clib_warning ("VCL<%d>: Invalid debug level specified in "
"the environment variable "
VPPCOM_ENV_DEBUG
" (%s)!\n", getpid (), env_var_str);
else
{
vcm->debug = tmp;
- clib_warning ("[%d] configured debug level (%u) from "
+ clib_warning ("VCL<%d>: configured VCL debug level (%u) from "
VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug);
}
}
{
conf_fname = VPPCOM_CONF_DEFAULT;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] getenv '%s' failed!", getpid (),
+ clib_warning ("VCL<%d>: getenv '%s' failed!", getpid (),
VPPCOM_ENV_CONF);
}
vppcom_cfg_heapsize (conf_fname);
clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured namespace_id (%v) from "
+ clib_warning ("VCL<%d>: configured namespace_id (%v) from "
VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (),
vcm->cfg.namespace_id);
}
{
u64 tmp;
if (sscanf (env_var_str, "%lu", &tmp) != 1)
- clib_warning ("[%d] Invalid namespace secret specified in "
+ clib_warning ("VCL<%d>: Invalid namespace secret specified in "
"the environment variable "
VPPCOM_ENV_APP_NAMESPACE_SECRET
" (%s)!\n", getpid (), env_var_str);
{
vcm->cfg.namespace_secret = tmp;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured namespace secret (%lu) from "
- VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (),
- vcm->cfg.namespace_secret);
+ clib_warning ("VCL<%d>: configured 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 ("[%d] configured app_proxy_transport_tcp (%u) from "
- VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP "!", getpid (),
- vcm->cfg.app_proxy_transport_tcp);
+ clib_warning ("VCL<%d>: configured 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 ("[%d] configured app_proxy_transport_udp (%u) from "
- VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP "!", getpid (),
- vcm->cfg.app_proxy_transport_udp);
+ clib_warning ("VCL<%d>: configured 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 ("[%d] configured app_scope_local (%u) from "
+ clib_warning ("VCL<%d>: configured app_scope_local (%u) from "
VPPCOM_ENV_APP_SCOPE_LOCAL "!", getpid (),
vcm->cfg.app_scope_local);
}
{
vcm->cfg.app_scope_global = 1;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] configured app_scope_global (%u) from "
+ clib_warning ("VCL<%d>: configured app_scope_global (%u) from "
VPPCOM_ENV_APP_SCOPE_GLOBAL "!", getpid (),
vcm->cfg.app_scope_global);
}
svm_fifo_segment_init (vcl_cfg->segment_baseva,
20 /* timeout in secs */ );
clib_spinlock_init (&vcm->sessions_lockp);
- vppcom_api_hookup ();
}
if (vcm->my_client_index == ~0)
{
+ vppcom_api_hookup ();
vcm->app_state = STATE_APP_START;
rv = vppcom_connect_to_vpp (app_name);
if (rv)
{
- clib_warning ("[%d] ERROR: couldn't connect to VPP!", getpid ());
+ clib_warning ("VCL<%d>: ERROR: couldn't connect to VPP!",
+ getpid ());
return rv;
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sending session enable", getpid ());
+ clib_warning ("VCL<%d>: sending session enable", getpid ());
rv = vppcom_app_session_enable ();
if (rv)
{
- clib_warning ("[%d] ERROR: vppcom_app_session_enable() failed!",
- getpid ());
+ clib_warning ("VCL<%d>: ERROR: vppcom_app_session_enable() "
+ "failed!", getpid ());
return rv;
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sending app attach", getpid ());
+ clib_warning ("VCL<%d>: sending app attach", getpid ());
rv = vppcom_app_attach ();
if (rv)
{
- clib_warning ("[%d] ERROR: vppcom_app_attach() failed!", getpid ());
+ clib_warning ("VCL<%d>: ERROR: vppcom_app_attach() failed!",
+ getpid ());
return rv;
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] app_name '%s', my_client_index %d (0x%x)",
+ clib_warning ("VCL<%d>: app_name '%s', my_client_index %d (0x%x)",
getpid (), app_name, vcm->my_client_index,
vcm->my_client_index);
}
return;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] detaching from VPP, my_client_index %d (0x%x)",
+ clib_warning ("VCL<%d>: detaching from VPP, my_client_index %d (0x%x)",
getpid (), vcm->my_client_index, vcm->my_client_index);
if (VPPCOM_DEBUG > 0)
if (PREDICT_FALSE (rv))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] application detach timed out! returning %d (%s)",
+ clib_warning ("VCL<%d>: application detach timed out! "
+ "returning %d (%s)",
getpid (), rv, vppcom_retval_str (rv));
}
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid %u", getpid (), session_index);
+ clib_warning ("VCL<%d>: sid %u", getpid (), session_index);
if (VPPCOM_DEBUG > 0)
{
if (VPPCOM_DEBUG > 0)
{
if (is_vep)
- clib_warning ("[%d] vep_idx %u / sid %u: closing epoll session...",
+ clib_warning ("VCL<%d>: vep_idx %u / sid %u: "
+ "closing epoll session...",
getpid (), session_index, session_index);
else
- clib_warning ("[%d] vpp handle 0x%llx, sid %d: closing session...",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %d: "
+ "closing session...",
getpid (), vpp_handle, session_index);
}
{
rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0);
if ((VPPCOM_DEBUG > 0) && PREDICT_FALSE (rv < 0))
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL "
- "vep_idx %u failed! rv %d (%s)", getpid (),
- vpp_handle, next_sid, vep_idx,
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "EPOLL_CTL_DEL vep_idx %u failed! rv %d (%s)",
+ getpid (), vpp_handle, next_sid, vep_idx,
rv, vppcom_retval_str (rv));
VCL_LOCK_AND_GET_SESSION (session_index, &session);
{
rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0);
if ((VPPCOM_DEBUG > 0) && (rv < 0))
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL "
- "vep_idx %u failed! rv %d (%s)",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "EPOLL_CTL_DEL vep_idx %u failed! rv %d (%s)",
getpid (), vpp_handle, session_index,
vep_idx, rv, vppcom_retval_str (rv));
}
if (PREDICT_FALSE (rv < 0))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"listener unbind failed! rv %d (%s)",
getpid (), vpp_handle, session_index,
rv, vppcom_retval_str (rv));
{
rv = vppcom_session_disconnect (session_index);
if (PREDICT_FALSE (rv < 0))
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"session disconnect failed! rv %d (%s)",
getpid (), vpp_handle, session_index,
rv, vppcom_retval_str (rv));
if (VPPCOM_DEBUG > 0)
{
if (is_vep)
- clib_warning ("[%d] vep_idx %u / sid %u: epoll session removed.",
+ clib_warning ("VCL<%d>: vep_idx %u / sid %u: epoll session removed.",
getpid (), session_index, session_index);
else
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: session removed.",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session removed.",
getpid (), vpp_handle, session_index);
}
done:
if (session->is_vep)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: sid %u: cannot bind to an epoll session!",
- getpid (), session_index);
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot "
+ "bind to an epoll session!", getpid (), session_index);
rv = VPPCOM_EBADFD;
goto done;
}
session->lcl_port = ep->port;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid %u: binding to local %s address %U "
+ clib_warning ("VCL<%d>: sid %u: binding to local %s address %U "
"port %u, proto %s", getpid (), session_index,
session->lcl_addr.is_ip4 ? "IPv4" : "IPv6",
format_ip46_address, &session->lcl_addr.ip46,
if (listen_session->is_vep)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: sid %u: cannot listen on an "
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an "
"epoll session!", getpid (), listen_session_index);
rv = VPPCOM_EBADFD;
goto done;
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"already in listen state!",
getpid (), listen_vpp_handle, listen_session_index);
rv = VPPCOM_OK;
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: sending bind request...",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, "
+ "sid %u: sending bind request...",
getpid (), listen_vpp_handle, listen_session_index);
vppcom_send_bind_sock (listen_session, listen_session_index);
if (PREDICT_FALSE (retval))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: bind failed! "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind failed! "
"returning %d (%s)", getpid (),
listen_session->vpp_handle, listen_session_index,
retval, vppcom_retval_str (retval));
int
vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep,
- uint32_t flags, double wait_for_time)
+ uint32_t flags)
{
session_t *listen_session = 0;
session_t *client_session = 0;
if (listen_session->is_vep)
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: sid %u: cannot accept on an "
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an "
"epoll session!", getpid (), listen_session_index);
rv = VPPCOM_EBADFD;
goto done;
listen_vpp_handle = listen_session->vpp_handle;
if (listen_session->state != STATE_LISTEN)
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"not in listen state! state 0x%x (%s)", getpid (),
listen_vpp_handle, listen_session_index,
listen_session->state,
rv = VPPCOM_EBADFD;
goto done;
}
- wait_for = ((listen_session->is_nonblocking) ? 0 :
- (wait_for_time < 0) ? vcm->cfg.accept_timeout : wait_for_time);
+ wait_for = (listen_session->is_nonblocking) ? 0 : vcm->cfg.accept_timeout;
clib_spinlock_unlock (&vcm->sessions_lockp);
if (rv)
{
if ((VPPCOM_DEBUG > 0))
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: accept failed! "
- "returning %d (%s)", getpid (),
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
+ "accept failed! returning %d (%s)", getpid (),
listen_vpp_handle, listen_session_index,
rv, vppcom_retval_str (rv));
- if ((wait_for == 0) || (wait_for_time > 0))
+ if (wait_for == 0)
goto done;
}
else
if (PREDICT_FALSE (rv))
{
rv = VPPCOM_ECONNABORTED;
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: client sid %u "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client sid %u "
"lookup failed! returning %d (%s)", getpid (),
listen_vpp_handle, listen_session_index,
client_session_index, rv, vppcom_retval_str (rv));
client_session->is_nonblocking = (flags & O_NONBLOCK) ? 1 : 0;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: Got a client request! "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! "
"vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u",
getpid (), listen_vpp_handle, listen_session_index,
client_session->vpp_handle, client_session_index,
flags, client_session->is_nonblocking);
- ep->vrf = client_session->vrf;
- ep->is_cut_thru = client_session->is_cut_thru;
- ep->is_ip4 = client_session->peer_addr.is_ip4;
- ep->port = client_session->peer_port;
- if (client_session->peer_addr.is_ip4)
- clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip4,
- sizeof (ip4_address_t));
- else
- clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip6,
- sizeof (ip6_address_t));
+ if (ep)
+ {
+ ep->vrf = client_session->vrf;
+ ep->is_cut_thru = client_session->is_cut_thru;
+ ep->is_ip4 = client_session->peer_addr.is_ip4;
+ ep->port = client_session->peer_port;
+ if (client_session->peer_addr.is_ip4)
+ clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip4,
+ sizeof (ip4_address_t));
+ else
+ clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip6,
+ sizeof (ip6_address_t));
+ }
if (client_session->is_server && client_session->is_cut_thru)
{
rv = svm_fifo_segment_create (a);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"client sid %u svm_fifo_segment_create ('%s') "
"failed! rv %d", getpid (), listen_vpp_handle,
listen_session_index, client_session_index,
if (PREDICT_FALSE (!client_session->server_rx_fifo))
{
svm_fifo_segment_delete (seg);
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"client sid %u rx fifo alloc failed! "
"size %ld (0x%lx)", getpid (), listen_vpp_handle,
listen_session_index, client_session_index,
if (PREDICT_FALSE (!client_session->server_tx_fifo))
{
svm_fifo_segment_delete (seg);
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"client sid %u tx fifo alloc failed! "
"size %ld (0x%lx)", getpid (), listen_vpp_handle,
listen_session_index, client_session_index,
client_session_index;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: client sid %u "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client sid %u "
"created segment '%s', rx_fifo %p, tx_fifo %p",
getpid (), listen_vpp_handle, listen_session_index,
client_session_index, client_session->segment_name,
}
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: accepted vpp handle "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle "
"0x%llx, sid %u%sconnection to local %s address "
"%U port %u", getpid (), listen_vpp_handle,
listen_session_index, client_session->vpp_handle,
if (PREDICT_FALSE (session->is_vep))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: sid %u: cannot connect on an epoll session!",
- getpid (), session_index);
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot "
+ "connect on an epoll session!", getpid (), session_index);
rv = VPPCOM_EBADFD;
goto done;
}
if (PREDICT_FALSE (session->is_server))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: is in use "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: is in use "
"as a server session!", getpid (), vpp_handle,
session_index);
rv = VPPCOM_EBADFD;
if (PREDICT_FALSE (session->state & CLIENT_STATE_OPEN))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: session already "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session already "
"connected to %s %U port %d proto %s, state 0x%x (%s)",
getpid (), vpp_handle, session_index,
session->peer_addr.is_ip4 ? "IPv4" : "IPv6",
session->peer_port = server_ep->port;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: connecting to server "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server "
"%s %U port %d proto %s",
getpid (), vpp_handle, session_index,
session->peer_addr.is_ip4 ? "IPv4" : "IPv6",
{
rv = retval;
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: connect failed! "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect failed! "
"returning %d (%s)", getpid (), vpp_handle,
session_index, rv, vppcom_retval_str (rv));
}
else if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: connected!",
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connected!",
getpid (), vpp_handle, session_index);
return rv;
if (PREDICT_FALSE (session->is_vep))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: sid %u: cannot read from an epoll session!",
- getpid (), session_index);
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot "
+ "read from an epoll session!", getpid (), session_index);
rv = VPPCOM_EBADFD;
goto done;
}
VPPCOM_ECONNRESET : VPPCOM_ENOTCONN);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: %s session is "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s session is "
"not open! state 0x%x (%s), returning %d (%s)",
getpid (), vpp_handle, session_index,
is_server ? "server" : "client", state,
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: Empty fifo "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo "
"with %s session state 0x%x (%s)!"
" Setting state to 0x%x (%s), returning %d (%s)",
getpid (), vpp_handle, session_index,
if (VPPCOM_DEBUG > 2)
{
if (rv > 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: read %d bytes "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes "
"from %s (%p)", getpid (), vpp_handle,
session_index, n_read, fifo_str, rx_fifo);
else
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: nothing read! "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: nothing read! "
"returning %d (%s)", getpid (), vpp_handle,
session_index, rv, vppcom_retval_str (rv));
}
}
int
-vppcom_session_read (uint32_t session_index, void *buf, int n)
+vppcom_session_read (uint32_t session_index, void *buf, size_t n)
{
return (vppcom_session_read_internal (session_index, buf, n, 0));
}
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
if (PREDICT_FALSE (session->is_vep))
{
- clib_warning ("[%d] ERROR: sid %u: cannot read from an "
+ clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an "
"epoll session!", getpid (), session_index);
rv = VPPCOM_EBADFD;
goto done;
VPPCOM_ENOTCONN);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: %s session is "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: %s session is "
"not open! state 0x%x (%s), returning %d (%s)",
getpid (), vpp_handle, session_index,
is_server ? "server" : "client",
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: Empty fifo with"
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, "
+ "sid %u: Empty fifo with"
" %s session state 0x%x (%s)! Setting state to "
"0x%x (%s), returning %d (%s)",
getpid (), session_index, vpp_handle,
pthread_mutex_unlock (&vcm->app_event_queue->mutex);
}
-
done:
return rv;
}
int
-vppcom_session_write (uint32_t session_index, void *buf, int n)
+vppcom_session_write (uint32_t session_index, void *buf, size_t n)
{
session_t *session = 0;
svm_fifo_t *tx_fifo;
if (PREDICT_FALSE (session->is_vep))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"cannot write to an epoll session!",
getpid (), session->vpp_handle, session_index);
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"%s session is not open! state 0x%x (%s)",
getpid (), vpp_handle, session_index,
is_server ? "server" : "client", state,
do
{
- n_write = svm_fifo_enqueue_nowait (tx_fifo, n, buf);
+ n_write = svm_fifo_enqueue_nowait (tx_fifo, n, (void *) buf);
}
while (!is_nonblocking && (n_write <= 0));
svm_queue_add (q, (u8 *) & evt, 0 /* do wait for mutex */ );
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"added FIFO_EVENT_APP_TX to "
"vpp_event_q %p, n_write %d", getpid (),
vpp_handle, session_index, q, n_write);
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"Empty fifo with %s session state 0x%x (%s)!"
" Setting state to 0x%x (%s), returning %d (%s)",
getpid (), vpp_handle, session_index,
if (VPPCOM_DEBUG > 2)
{
if (n_write <= 0)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"FIFO-FULL %s (%p)", getpid (), vpp_handle,
session_index, fifo_str, tx_fifo);
else
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"wrote %d bytes to %s (%p)", getpid (), vpp_handle,
session_index, n_write, fifo_str, tx_fifo);
}
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
if (PREDICT_FALSE (session->is_vep))
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"cannot write to an epoll session!",
getpid (), session->vpp_handle, session_index);
rv = VPPCOM_EBADFD;
if (PREDICT_FALSE (session->is_listen))
{
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"cannot write to a listen session!",
getpid (), session->vpp_handle, session_index);
rv = VPPCOM_EBADFD;
rv = ((state == STATE_DISCONNECT) ? VPPCOM_ECONNRESET :
VPPCOM_ENOTCONN);
- clib_warning ("[%d] ERROR: vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
"%s session is not open! state 0x%x (%s), "
"returning %d (%s)", getpid (), session->vpp_handle,
session_index, is_server ? "server" : "client",
ready = svm_fifo_max_enqueue (tx_fifo);
if (VPPCOM_DEBUG > 3)
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"peek %s (%p), ready = %d", getpid (),
session->vpp_handle, session_index,
fifo_str, tx_fifo, ready);
if (VPPCOM_DEBUG > 1)
{
- clib_warning ("[%d] vpp handle 0x%llx, sid %u: "
+ clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: "
"Empty fifo with %s session "
"state 0x%x (%s)! Setting state to 0x%x (%s), "
"returning %d (%s)", getpid (),
if (n_bits && read_map)
{
clib_bitmap_validate (vcm->rd_bitmap, minbits);
- clib_memcpy (vcm->rd_bitmap, read_map, vec_len (vcm->rd_bitmap));
- memset (read_map, 0, vec_len (vcm->rd_bitmap));
+ clib_memcpy (vcm->rd_bitmap, read_map,
+ vec_len (vcm->rd_bitmap) * sizeof (clib_bitmap_t));
+ memset (read_map, 0, vec_len (vcm->rd_bitmap) * sizeof (clib_bitmap_t));
}
if (n_bits && write_map)
{
clib_bitmap_validate (vcm->wr_bitmap, minbits);
- clib_memcpy (vcm->wr_bitmap, write_map, vec_len (vcm->wr_bitmap));
- memset (write_map, 0, vec_len (vcm->wr_bitmap));
+ clib_memcpy (vcm->wr_bitmap, write_map,
+ vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t));
+ memset (write_map, 0,
+ vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t));
}
if (n_bits && except_map)
{
clib_bitmap_validate (vcm->ex_bitmap, minbits);
- clib_memcpy (vcm->ex_bitmap, except_map, vec_len (vcm->ex_bitmap));
- memset (except_map, 0, vec_len (vcm->ex_bitmap));
+ clib_memcpy (vcm->ex_bitmap, except_map,
+ vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t));
+ memset (except_map, 0,
+ vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t));
}
do
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] session %d specified in "
+ clib_warning ("VCL<%d>: session %d specified in "
"read_map is closed.", getpid (),
session_index);
bits_set = VPPCOM_EBADFD;
clib_bitmap_get (vcm->ex_bitmap, session_index) &&
(rv < 0))
{
- // TBD: clib_warning
clib_bitmap_set_no_check (except_map, session_index, 1);
bits_set++;
}
else if (rv > 0)
{
- // TBD: clib_warning
clib_bitmap_set_no_check (read_map, session_index, 1);
bits_set++;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] session %d specified in "
+ clib_warning ("VCL<%d>: session %d specified in "
"write_map is closed.", getpid (),
session_index);
bits_set = VPPCOM_EBADFD;
clib_spinlock_unlock (&vcm->sessions_lockp);
if (write_map && (rv > 0))
{
- // TBD: clib_warning
clib_bitmap_set_no_check (write_map, session_index, 1);
bits_set++;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] session %d specified in "
+ clib_warning ("VCL<%d>: session %d specified in "
"except_map is closed.", getpid (),
session_index);
bits_set = VPPCOM_EBADFD;
clib_spinlock_unlock (&vcm->sessions_lockp);
if (rv < 0)
{
- // TBD: clib_warning
clib_bitmap_set_no_check (except_map, session_index, 1);
bits_set++;
}
}
/* *INDENT-ON* */
}
- while (clib_time_now (&vcm->clib_time) < timeout);
+ while ((time_to_wait == -1) || (clib_time_now (&vcm->clib_time) < timeout));
select_done:
return (bits_set);
rv = vppcom_session_at_index (vep_idx, &session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: Invalid vep_idx (%u)!", getpid (), vep_idx);
+ clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!",
+ getpid (), vep_idx);
goto done;
}
if (PREDICT_FALSE (!session->is_vep))
{
- clib_warning ("[%d] ERROR: vep_idx (%u) is not a vep!", getpid (),
- vep_idx);
+ clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!",
+ getpid (), vep_idx);
goto done;
}
vep = &session->vep;
- clib_warning ("[%d] vep_idx (%u): Dumping epoll chain\n"
+ clib_warning ("VCL<%d>: vep_idx (%u): Dumping epoll chain\n"
"{\n"
" is_vep = %u\n"
" is_vep_session = %u\n"
rv = vppcom_session_at_index (sid, &session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: Invalid sid (%u)!", getpid (), sid);
+ clib_warning ("VCL<%d>: ERROR: Invalid sid (%u)!", getpid (), sid);
goto done;
}
if (PREDICT_FALSE (session->is_vep))
- clib_warning ("[%d] ERROR: sid (%u) is a vep!", getpid (), vep_idx);
+ clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!",
+ getpid (), vep_idx);
else if (PREDICT_FALSE (!session->is_vep_session))
{
- clib_warning ("[%d] ERROR: session (%u) is not a vep session!",
- getpid (), sid);
+ clib_warning ("VCL<%d>: ERROR: session (%u) "
+ "is not a vep session!", getpid (), sid);
goto done;
}
vep = &session->vep;
if (PREDICT_FALSE (vep->vep_idx != vep_idx))
- clib_warning ("[%d] ERROR: session (%u) vep_idx (%u) != "
+ clib_warning ("VCL<%d>: ERROR: session (%u) vep_idx (%u) != "
"vep_idx (%u)!", getpid (),
sid, session->vep.vep_idx, vep_idx);
if (session->is_vep_session)
}
done:
- clib_warning ("[%d] vep_idx (%u): Dump complete!\n", getpid (), vep_idx);
+ clib_warning ("VCL<%d>: vep_idx (%u): Dump complete!\n",
+ getpid (), vep_idx);
}
int
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] Created vep_idx %u / sid %u!",
+ clib_warning ("VCL<%d>: Created vep_idx %u / sid %u!",
getpid (), vep_idx, vep_idx);
if (VPPCOM_DEBUG > 0)
if (vep_idx == session_index)
{
- clib_warning ("[%d] ERROR: vep_idx == session_index (%u)!",
+ clib_warning ("VCL<%d>: ERROR: vep_idx == session_index (%u)!",
getpid (), vep_idx);
return VPPCOM_EINVAL;
}
rv = vppcom_session_at_index (vep_idx, &vep_session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: Invalid vep_idx (%u)!", vep_idx);
+ clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_idx);
goto done;
}
if (PREDICT_FALSE (!vep_session->is_vep))
{
- clib_warning ("[%d] ERROR: vep_idx (%u) is not a vep!",
+ clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!",
getpid (), vep_idx);
rv = VPPCOM_EINVAL;
goto done;
if (PREDICT_FALSE (rv))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] ERROR: Invalid session_index (%u)!",
+ clib_warning ("VCL<%d>: ERROR: Invalid session_index (%u)!",
getpid (), session_index);
goto done;
}
case EPOLL_CTL_ADD:
if (PREDICT_FALSE (!event))
{
- clib_warning ("[%d] ERROR: EPOLL_CTL_ADD: NULL pointer to "
+ clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: NULL pointer to "
"epoll_event structure!", getpid ());
rv = VPPCOM_EINVAL;
goto done;
&next_session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: EPOLL_CTL_ADD: Invalid "
+ clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: Invalid "
"vep.next_sid (%u) on vep_idx (%u)!",
getpid (), vep_session->vep.next_sid, vep_idx);
goto done;
session->is_vep_session = 1;
vep_session->vep.next_sid = session_index;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x,"
- " data 0x%llx!", getpid (), vep_idx, session_index,
+ clib_warning ("VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, "
+ "sid %u, events 0x%x, data 0x%llx!",
+ getpid (), vep_idx, session_index,
event->events, event->data.u64);
break;
case EPOLL_CTL_MOD:
if (PREDICT_FALSE (!event))
{
- clib_warning ("[%d] ERROR: EPOLL_CTL_MOD: NULL pointer to "
+ clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_MOD: NULL pointer to "
"epoll_event structure!", getpid ());
rv = VPPCOM_EINVAL;
goto done;
}
else if (PREDICT_FALSE (!session->is_vep_session))
{
- clib_warning ("[%d] ERROR: sid %u EPOLL_CTL_MOD: "
+ clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: "
"not a vep session!", getpid (), session_index);
rv = VPPCOM_EINVAL;
goto done;
}
else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx))
{
- clib_warning ("[%d] ERROR: sid %u EPOLL_CTL_MOD: "
+ clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: "
"vep_idx (%u) != vep_idx (%u)!",
getpid (), session_index,
session->vep.vep_idx, vep_idx);
session->vep.et_mask = VEP_DEFAULT_ET_MASK;
session->vep.ev = *event;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x,"
- " data 0x%llx!", getpid (), vep_idx, session_index,
- event->events, event->data.u64);
+ clib_warning
+ ("VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x,"
+ " data 0x%llx!", getpid (), vep_idx, session_index, event->events,
+ event->data.u64);
break;
case EPOLL_CTL_DEL:
if (PREDICT_FALSE (!session->is_vep_session))
{
- clib_warning ("[%d] ERROR: sid %u EPOLL_CTL_DEL: "
+ clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: "
"not a vep session!", getpid (), session_index);
rv = VPPCOM_EINVAL;
goto done;
}
else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx))
{
- clib_warning ("[%d] ERROR: sid %u EPOLL_CTL_DEL: "
+ clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: "
"vep_idx (%u) != vep_idx (%u)!",
getpid (), session_index,
session->vep.vep_idx, vep_idx);
rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: EPOLL_CTL_DEL: Invalid "
+ clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid "
"vep.prev_sid (%u) on sid (%u)!",
getpid (), session->vep.prev_sid, session_index);
goto done;
rv = vppcom_session_at_index (session->vep.next_sid, &next_session);
if (PREDICT_FALSE (rv))
{
- clib_warning ("[%d] ERROR: EPOLL_CTL_DEL: Invalid "
+ clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid "
"vep.next_sid (%u) on sid (%u)!",
getpid (), session->vep.next_sid, session_index);
goto done;
session->vep.vep_idx = ~0;
session->is_vep_session = 0;
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] EPOLL_CTL_DEL: vep_idx %u, sid %u!",
+ clib_warning ("VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!",
getpid (), vep_idx, session_index);
break;
default:
- clib_warning ("[%d] ERROR: Invalid operation (%d)!", getpid (), op);
+ clib_warning ("VCL<%d>: ERROR: Invalid operation (%d)!", getpid (), op);
rv = VPPCOM_EINVAL;
}
if (PREDICT_FALSE (maxevents <= 0))
{
- clib_warning ("[%d] ERROR: Invalid maxevents (%d)!",
+ clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!",
getpid (), maxevents);
return VPPCOM_EINVAL;
}
if (PREDICT_FALSE (!is_vep))
{
- clib_warning ("[%d] ERROR: vep_idx (%u) is not a vep!",
+ clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!",
getpid (), vep_idx);
rv = VPPCOM_EINVAL;
goto done;
if (PREDICT_FALSE (vep_next_sid == ~0))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] WARNING: vep_idx (%u) is empty!",
+ clib_warning ("VCL<%d>: WARNING: vep_idx (%u) is empty!",
getpid (), vep_idx);
goto done;
}
if (PREDICT_FALSE (is_vep))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] ERROR: sid (%u) is a vep!",
+ clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!",
getpid (), vep_idx);
rv = VPPCOM_EINVAL;
goto done;
if (PREDICT_FALSE (!is_vep_session))
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] ERROR: session (%u) is not "
+ clib_warning ("VCL<%d>: ERROR: session (%u) is not "
"a vep session!", getpid (), sid);
rv = VPPCOM_EINVAL;
goto done;
}
if (PREDICT_FALSE (session_vep_idx != vep_idx))
{
- clib_warning ("[%d] ERROR: session (%u) "
+ clib_warning ("VCL<%d>: ERROR: session (%u) "
"vep_idx (%u) != vep_idx (%u)!",
getpid (), sid, session->vep.vep_idx, vep_idx);
rv = VPPCOM_EINVAL;
case VPPCOM_ATTR_GET_NREAD:
rv = vppcom_session_read_ready (session, session_index);
if (VPPCOM_DEBUG > 2)
- clib_warning ("[%d] VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d",
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d",
getpid (), rv);
break;
case VPPCOM_ATTR_GET_NWRITE:
rv = vppcom_session_write_ready (session, session_index);
if (VPPCOM_DEBUG > 2)
- clib_warning ("[%d] VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d",
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d",
getpid (), session_index, rv);
break;
case VPPCOM_ATTR_GET_FLAGS:
- if (buffer && buflen && (*buflen >= sizeof (*flags)))
+ if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags))))
{
*flags = O_RDWR | ((session->is_nonblocking) ? O_NONBLOCK : 0);
*buflen = sizeof (*flags);
if (VPPCOM_DEBUG > 2)
- clib_warning ("[%d] VPPCOM_ATTR_GET_FLAGS: sid %u, "
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, "
"flags = 0x%08x, is_nonblocking = %u", getpid (),
session_index, *flags, session->is_nonblocking);
}
break;
case VPPCOM_ATTR_SET_FLAGS:
- if (buffer && buflen && (*buflen >= sizeof (*flags)))
+ if (PREDICT_TRUE (buffer && buflen && (*buflen == sizeof (*flags))))
{
session->is_nonblocking = (*flags & O_NONBLOCK) ? 1 : 0;
if (VPPCOM_DEBUG > 2)
- clib_warning ("[%d] VPPCOM_ATTR_SET_FLAGS: sid %u, "
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, "
"flags = 0x%08x, is_nonblocking = %u",
getpid (), session_index, *flags,
session->is_nonblocking);
break;
case VPPCOM_ATTR_GET_PEER_ADDR:
- if (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)
+ if (PREDICT_TRUE (buffer && buflen &&
+ (*buflen >= sizeof (*ep)) && ep->ip))
{
ep->vrf = session->vrf;
ep->is_ip4 = session->peer_addr.is_ip4;
sizeof (ip6_address_t));
*buflen = sizeof (*ep);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] VPPCOM_ATTR_GET_PEER_ADDR: sid %u, is_ip4 = "
- "%u, addr = %U, port %u", getpid (),
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, "
+ "is_ip4 = %u, addr = %U, port %u", getpid (),
session_index, ep->is_ip4, format_ip46_address,
&session->peer_addr.ip46, ep->is_ip4,
clib_net_to_host_u16 (ep->port));
break;
case VPPCOM_ATTR_GET_LCL_ADDR:
- if (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)
+ if (PREDICT_TRUE (buffer && buflen &&
+ (*buflen >= sizeof (*ep)) && ep->ip))
{
ep->vrf = session->vrf;
ep->is_ip4 = session->lcl_addr.is_ip4;
sizeof (ip6_address_t));
*buflen = sizeof (*ep);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = "
- "%u, addr = %U port %d", getpid (),
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, "
+ "is_ip4 = %u, addr = %U port %d", getpid (),
session_index, ep->is_ip4, format_ip46_address,
&session->lcl_addr.ip46, ep->is_ip4,
clib_net_to_host_u16 (ep->port));
rv = VPPCOM_EINVAL;
break;
+ case VPPCOM_ATTR_GET_LIBC_EPFD:
+ rv = session->libc_epfd;
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d",
+ getpid (), rv);
+ break;
+
+ case VPPCOM_ATTR_SET_LIBC_EPFD:
+ if (PREDICT_TRUE (buffer && buflen &&
+ (*buflen == sizeof (session->libc_epfd))))
+ {
+ session->libc_epfd = *(int *) buffer;
+ *buflen = sizeof (session->libc_epfd);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, "
+ "buflen %d", getpid (), session->libc_epfd,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_PROTOCOL:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ *(int *) buffer = session->proto;
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), "
+ "buflen %d", getpid (), *(int *) buffer,
+ *(int *) buffer ? "UDP" : "TCP", *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_LISTEN:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_LISTEN);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, "
+ "buflen %d", getpid (), *(int *) buffer, *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_ERROR:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ *(int *) buffer = 0;
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ *(int *) buffer, *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_TX_FIFO_LEN:
+ if (buffer && buflen && (*buflen >= sizeof (u32)))
+ {
+ svm_fifo_t *tx_fifo;
+
+ tx_fifo = ((!session->is_cut_thru || session->is_server) ?
+ session->server_tx_fifo : session->server_rx_fifo);
+
+ /* VPP-TBD */
+ *(size_t *) buffer = (session->sndbuf_size ? session->sndbuf_size :
+ tx_fifo ? tx_fifo->nitems :
+ vcm->cfg.tx_fifo_size);
+ *buflen = sizeof (u32);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), "
+ "buflen %d, #VPP-TBD#", getpid (),
+ *(size_t *) buffer, *(size_t *) buffer, *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_TX_FIFO_LEN:
+ if (buffer && buflen && (*buflen == sizeof (u32)))
+ {
+ /* VPP-TBD */
+ session->sndbuf_size = *(u32 *) buffer;
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), "
+ "buflen %d, #VPP-TBD#", getpid (),
+ session->sndbuf_size, session->sndbuf_size,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_RX_FIFO_LEN:
+ if (buffer && buflen && (*buflen >= sizeof (u32)))
+ {
+ svm_fifo_t *rx_fifo;
+
+ rx_fifo = ((!session->is_cut_thru || session->is_server) ?
+ session->server_rx_fifo : session->server_tx_fifo);
+
+ /* VPP-TBD */
+ *(size_t *) buffer = (session->rcvbuf_size ? session->rcvbuf_size :
+ rx_fifo ? rx_fifo->nitems :
+ vcm->cfg.rx_fifo_size);
+ *buflen = sizeof (u32);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), "
+ "buflen %d, #VPP-TBD#", getpid (),
+ *(size_t *) buffer, *(size_t *) buffer, *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_RX_FIFO_LEN:
+ if (buffer && buflen && (*buflen == sizeof (u32)))
+ {
+ /* VPP-TBD */
+ session->rcvbuf_size = *(u32 *) buffer;
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), "
+ "buflen %d, #VPP-TBD#", getpid (),
+ session->sndbuf_size, session->sndbuf_size,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_REUSEADDR:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_REUSEADDR);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
case VPPCOM_ATTR_SET_REUSEADDR:
+ if (buffer && buflen && (*buflen == sizeof (int)) &&
+ !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEADDR);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_REUSEADDR),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_REUSEPORT:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_REUSEPORT);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_REUSEPORT:
+ if (buffer && buflen && (*buflen == sizeof (int)) &&
+ !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEPORT);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_REUSEPORT),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_BROADCAST:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_BROADCAST);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
case VPPCOM_ATTR_SET_BROADCAST:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_BROADCAST);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_BROADCAST),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_V6ONLY:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_V6ONLY);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
case VPPCOM_ATTR_SET_V6ONLY:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_V6ONLY);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_V6ONLY), *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_KEEPALIVE:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_KEEPALIVE);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
case VPPCOM_ATTR_SET_KEEPALIVE:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_KEEPALIVE);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_KEEPALIVE),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_TCP_NODELAY:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_NODELAY);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_TCP_NODELAY:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_NODELAY);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_NODELAY),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_TCP_KEEPIDLE:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_KEEPIDLE);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
case VPPCOM_ATTR_SET_TCP_KEEPIDLE:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_KEEPIDLE),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_TCP_KEEPINTVL:
+ if (buffer && buflen && (*buflen >= sizeof (int)))
+ {
+ /* VPP-TBD */
+ *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_KEEPINTVL);
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
case VPPCOM_ATTR_SET_TCP_KEEPINTVL:
+ if (buffer && buflen && (*buflen == sizeof (int)))
+ {
+ /* VPP-TBD */
+ if (*(int *) buffer)
+ VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL);
+ else
+ VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ VCL_SESS_ATTR_TEST (session->attr,
+ VCL_SESS_ATTR_TCP_KEEPINTVL),
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_TCP_USER_MSS:
+ if (buffer && buflen && (*buflen >= sizeof (u32)))
+ {
+ /* VPP-TBD */
+ *(u32 *) buffer = session->user_mss;
+ *buflen = sizeof (int);
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, "
+ "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
+ *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_TCP_USER_MSS:
+ if (buffer && buflen && (*buflen == sizeof (u32)))
+ {
+ /* VPP-TBD */
+ session->user_mss = *(u32 *) buffer;
+
+ if (VPPCOM_DEBUG > 2)
+ clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %u, "
+ "buflen %d, #VPP-TBD#", getpid (),
+ session->user_mss, *buflen);
+ }
+ else
+ rv = VPPCOM_EINVAL;
break;
default:
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%u) has been closed!",
+ clib_warning ("VCL<%d>: invalid session, "
+ "sid (%u) has been closed!",
getpid (), session_index);
rv = VPPCOM_EBADFD;
clib_spinlock_unlock (&vcm->sessions_lockp);
rv = vppcom_session_peek (session_index, buffer, buflen);
else
{
- clib_warning ("[%d] Unsupport flags for recvfrom %d", getpid (), flags);
+ clib_warning ("VCL<%d>: Unsupport flags for recvfrom %d",
+ getpid (), flags);
rv = VPPCOM_EAFNOSUPPORT;
}
{
// TBD check the flags and do the right thing
if (VPPCOM_DEBUG > 2)
- clib_warning ("[%d] handling flags 0x%u (%d) not implemented yet.",
- getpid (), flags, flags);
+ clib_warning ("VCL<%d>: handling flags 0x%u (%d) "
+ "not implemented yet.", getpid (), flags, flags);
}
return (vppcom_session_write (session_index, buffer, buflen));
}
+int
+vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time)
+{
+ f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time;
+ u32 i, keep_trying = 1;
+ int rv, num_ev = 0;
+
+ if (VPPCOM_DEBUG > 3)
+ clib_warning ("VCL<%d>: vp %p, nsids %u, wait_for_time %f",
+ getpid (), vp, n_sids, wait_for_time);
+
+ if (!vp)
+ return VPPCOM_EFAULT;
+
+ do
+ {
+ session_t *session;
+
+ for (i = 0; i < n_sids; i++)
+ {
+ ASSERT (vp[i].revents);
+
+ VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
+ if (*vp[i].revents)
+ *vp[i].revents = 0;
+
+ if (POLLIN & vp[i].events)
+ {
+ VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session);
+ rv = vppcom_session_read_ready (session, vp[i].sid);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ if (rv > 0)
+ {
+ *vp[i].revents |= POLLIN;
+ num_ev++;
+ }
+ else if (rv < 0)
+ {
+ switch (rv)
+ {
+ case VPPCOM_ECONNRESET:
+ *vp[i].revents = POLLHUP;
+ break;
+
+ default:
+ *vp[i].revents = POLLERR;
+ break;
+ }
+ num_ev++;
+ }
+ }
+
+ if (POLLOUT & vp[i].events)
+ {
+ VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session);
+ rv = vppcom_session_write_ready (session, vp[i].sid);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ if (rv > 0)
+ {
+ *vp[i].revents |= POLLOUT;
+ num_ev++;
+ }
+ else if (rv < 0)
+ {
+ switch (rv)
+ {
+ case VPPCOM_ECONNRESET:
+ *vp[i].revents = POLLHUP;
+ break;
+
+ default:
+ *vp[i].revents = POLLERR;
+ break;
+ }
+ num_ev++;
+ }
+ }
+
+ if (0)
+ {
+ done:
+ *vp[i].revents = POLLNVAL;
+ num_ev++;
+ }
+ }
+ if (wait_for_time != -1)
+ keep_trying = (clib_time_now (&vcm->clib_time) <= timeout) ? 1 : 0;
+ }
+ while ((num_ev == 0) && keep_trying);
+
+ if (VPPCOM_DEBUG > 3)
+ {
+ clib_warning ("VCL<%d>: returning %d", getpid (), num_ev);
+ for (i = 0; i < n_sids; i++)
+ {
+ clib_warning ("VCL<%d>: vp[%d].sid %d (0x%x), .events 0x%x, "
+ ".revents 0x%x", getpid (), i, vp[i].sid, vp[i].sid,
+ vp[i].events, *vp[i].revents);
+ }
+ }
+ return num_ev;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*
Code Review / vpp.git / blobdiff