Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl: allow non-blocking connects
[vpp.git]
/
src
/
plugins
/
hs_apps
/
vcl
/
sock_test_client.c
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
(file)
--- a/
src/plugins/hs_apps/vcl/sock_test_client.c
+++ b/
src/plugins/hs_apps/vcl/sock_test_client.c
@@
-651,14
+651,6
@@
sock_test_connect_test_sockets (uint32_t num_test_sockets)
errno_val);
return tsock->fd;
}
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);
#ifdef VCL_TEST
rv = vppcom_session_connect (tsock->fd, &scm->server_endpt);
@@
-668,9
+660,8
@@
sock_test_connect_test_sockets (uint32_t num_test_sockets)
rv = -1;
}
#else
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)
{
#endif
if (rv < 0)
{
@@
-680,6
+671,14
@@
sock_test_connect_test_sockets (uint32_t num_test_sockets)
"(errno = %d)!\n", errno_val);
return -1;
}
"(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);
tsock->cfg = ctrl->cfg;
vcl_test_session_buf_alloc (tsock);
sock_test_cfg_sync (tsock);