nbytes, &tsock->stats);
if (rx_bytes > 0)
{
- printf ("CLIENT (fd %d): RX (%d bytes) - '%s'\n",
- tsock->fd, rx_bytes, tsock->rxbuf);
+ printf ("CLIENT (fd %d): RX (%d bytes)\n", tsock->fd,
+ rx_bytes);
if (tsock->stats.rx_bytes != tsock->stats.tx_bytes)
printf ("CLIENT: WARNING: bytes read (%lu) "
{
static char buf[64];
- sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd);
+ snprintf (buf, sizeof (buf), "CLIENT (fd %d) RESULTS", tsock->fd);
vcl_test_stats_dump (buf, &tsock->stats,
1 /* show_rx */ , 1 /* show tx */ ,
ctrl->cfg.verbose);
{
static char buf[64];
- sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd);
+ snprintf (buf, sizeof (buf), "CLIENT (fd %d) RESULTS", tsock->fd);
vcl_test_stats_dump (buf, &tsock->stats,
test == VCL_TEST_TYPE_BI /* show_rx */ ,
1 /* show tx */ , ctrl->cfg.verbose);
return -1;
}
- if (!scm->test_socket)
- memset (tsock, 0, sizeof (*tsock));
+ memset (&tsock[scm->num_test_sockets], 0,
+ sizeof (vcl_test_session_t) * (num_test_sockets -
+ scm->num_test_sockets));
scm->test_socket = tsock;
for (i = scm->num_test_sockets; i < num_test_sockets; i++)
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);
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)
{
"(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);