vcl: allow non-blocking connects
Type: feature
Change-Id: I55349f482ce6781337f747b2f0d2c0a027c3a675
Signed-off-by: Florin Coras <fcoras@cisco.com>
diff --git a/src/plugins/hs_apps/vcl/sock_test_client.c b/src/plugins/hs_apps/vcl/sock_test_client.c
index 13227f2..ed43e7f 100644
--- a/src/plugins/hs_apps/vcl/sock_test_client.c
+++ b/src/plugins/hs_apps/vcl/sock_test_client.c
@@ -651,14 +651,6 @@
errno_val);
return tsock->fd;
}
- if (fcntl (tsock->fd, F_SETFL, O_NONBLOCK) < 0)
- {
- errno_val = errno;
- perror ("ERROR in sock_test_connect_test_sockets()");
- fprintf (stderr, "CLIENT: ERROR: fcntl failed (errno = %d)!\n",
- errno_val);
- return -1;
- }
#ifdef VCL_TEST
rv = vppcom_session_connect (tsock->fd, &scm->server_endpt);
@@ -668,9 +660,8 @@
rv = -1;
}
#else
- rv =
- connect (tsock->fd, (struct sockaddr *) &scm->server_addr,
- scm->server_addr_size);
+ rv = connect (tsock->fd, (struct sockaddr *) &scm->server_addr,
+ scm->server_addr_size);
#endif
if (rv < 0)
{
@@ -680,6 +671,14 @@
"(errno = %d)!\n", errno_val);
return -1;
}
+ if (fcntl (tsock->fd, F_SETFL, O_NONBLOCK) < 0)
+ {
+ errno_val = errno;
+ perror ("ERROR in sock_test_connect_test_sockets()");
+ fprintf (stderr, "CLIENT: ERROR: fcntl failed (errno = %d)!\n",
+ errno_val);
+ return -1;
+ }
tsock->cfg = ctrl->cfg;
vcl_test_session_buf_alloc (tsock);
sock_test_cfg_sync (tsock);
diff --git a/src/plugins/hs_apps/vcl/vcl_test_client.c b/src/plugins/hs_apps/vcl/vcl_test_client.c
index b9bdd6e..55bc788 100644
--- a/src/plugins/hs_apps/vcl/vcl_test_client.c
+++ b/src/plugins/hs_apps/vcl/vcl_test_client.c
@@ -123,7 +123,7 @@
{
vcl_test_client_main_t *vcm = &vcl_client_main;
vcl_test_session_t *ts, *tq;
- uint32_t i;
+ uint32_t i, flags, flen;
int rv;
if (wrk->cfg.num_test_sessions < 1 || wrk->cfg.num_test_sessions_perq < 1)
@@ -155,7 +155,7 @@
for (i = 0; i < wrk->cfg.num_test_qsessions; i++)
{
tq = &wrk->qsessions[i];
- tq->fd = vppcom_session_create (vcm->proto, 1 /* is_nonblocking */ );
+ tq->fd = vppcom_session_create (vcm->proto, 0 /* is_nonblocking */ );
tq->session_index = i;
if (tq->fd < 0)
{
@@ -163,12 +163,16 @@
return tq->fd;
}
+ /* Connect is blocking */
rv = vppcom_session_connect (tq->fd, &vcm->server_endpt);
if (rv < 0)
{
vterr ("vppcom_session_connect()", rv);
return rv;
}
+ flags = O_NONBLOCK;
+ flen = sizeof (flags);
+ vppcom_session_attr (tq->fd, VPPCOM_ATTR_SET_FLAGS, &flags, &flen);
vtinf ("Test Qsession %d (fd %d) connected.", i, tq->fd);
}
wrk->n_qsessions = wrk->cfg.num_test_qsessions;
@@ -223,6 +227,7 @@
vcl_test_client_main_t *vcm = &vcl_client_main;
vcl_test_session_t *ts;
uint32_t n_test_sessions;
+ uint32_t flags, flen;
int i, rv;
if (vcm->proto == VPPCOM_PROTO_QUIC)
@@ -253,19 +258,23 @@
for (i = 0; i < n_test_sessions; i++)
{
ts = &wrk->sessions[i];
- ts->fd = vppcom_session_create (vcm->proto, 1 /* is_nonblocking */ );
+ ts->fd = vppcom_session_create (vcm->proto, 0 /* is_nonblocking */ );
if (ts->fd < 0)
{
vterr ("vppcom_session_create()", ts->fd);
return ts->fd;
}
+ /* Connect is blocking */
rv = vppcom_session_connect (ts->fd, &vcm->server_endpt);
if (rv < 0)
{
vterr ("vppcom_session_connect()", rv);
return rv;
}
+ flags = O_NONBLOCK;
+ flen = sizeof (flags);
+ vppcom_session_attr (ts->fd, VPPCOM_ATTR_SET_FLAGS, &flags, &flen);
vtinf ("Test session %d (fd %d) connected.", i, ts->fd);
}
wrk->n_sessions = n_test_sessions;
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index f56c02b..72ec4f4 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -1590,10 +1590,14 @@
clib_net_to_host_u16 (session->transport.rmt_port),
vppcom_proto_str (session->session_type));
- /*
- * Send connect request and wait for reply from vpp
- */
vcl_send_session_connect (wrk, session);
+
+ if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK))
+ return VPPCOM_EINPROGRESS;
+
+ /*
+ * Wait for reply from vpp if blocking
+ */
rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT,
vcm->cfg.session_timeout);
@@ -2033,7 +2037,14 @@
break;
case SESSION_CTRL_EVT_CONNECTED:
connected_msg = (session_connected_msg_t *) e->data;
- vcl_session_connected_handler (wrk, connected_msg);
+ sid = vcl_session_connected_handler (wrk, connected_msg);
+ if (sid == VCL_INVALID_SESSION_INDEX)
+ break;
+ if (sid < n_bits && write_map)
+ {
+ clib_bitmap_set_no_check ((uword *) write_map, sid, 1);
+ *bits_set += 1;
+ }
break;
case SESSION_CTRL_EVT_DISCONNECTED:
disconnected_msg = (session_disconnected_msg_t *) e->data;
diff --git a/src/vcl/vppcom.h b/src/vcl/vppcom.h
index 90bec31..6281509 100644
--- a/src/vcl/vppcom.h
+++ b/src/vcl/vppcom.h
@@ -18,6 +18,7 @@
#include <netdb.h>
#include <errno.h>
+#include <sys/fcntl.h>
#include <sys/poll.h>
#include <sys/epoll.h>
@@ -115,6 +116,7 @@
VPPCOM_OK = 0,
VPPCOM_EAGAIN = -EAGAIN,
VPPCOM_EWOULDBLOCK = -EWOULDBLOCK,
+ VPPCOM_EINPROGRESS = -EINPROGRESS,
VPPCOM_EFAULT = -EFAULT,
VPPCOM_ENOMEM = -ENOMEM,
VPPCOM_EINVAL = -EINVAL,