X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fsock_test_client.c;h=75913d9deda2fcdb4b1ae36051849a36b072eeaf;hb=a4878ed07801cd95e2a46372aa41e162ad170b68;hp=41ee4be9241b11c2caf019e1392765ba62597abd;hpb=ee45d41a10c3459fc11e7d037fc411fd4cdfd495;p=vpp.git diff --git a/src/vcl/sock_test_client.c b/src/vcl/sock_test_client.c index 41ee4be9241..75913d9deda 100644 --- a/src/vcl/sock_test_client.c +++ b/src/vcl/sock_test_client.c @@ -23,63 +23,90 @@ #include #include #include +#ifndef VCL_TEST +#include +#endif typedef struct { #ifdef VCL_TEST vppcom_endpt_t server_endpt; +#else + int af_unix_echo_tx; + int af_unix_echo_rx; #endif - struct sockaddr_in server_addr; - sock_test_socket_t ctrl_socket; - sock_test_socket_t *test_socket; + struct sockaddr_storage server_addr; + uint32_t server_addr_size; + uint32_t cfg_seq_num; + vcl_test_session_t ctrl_socket; + vcl_test_session_t *test_socket; uint32_t num_test_sockets; uint8_t dump_cfg; } sock_client_main_t; -sock_client_main_t sock_client_main; +sock_client_main_t vcl_client_main; static int -sock_test_cfg_sync (sock_test_socket_t * socket) +sock_test_cfg_sync (vcl_test_session_t * socket) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_cfg_t *rl_cfg = (sock_test_cfg_t *) socket->rxbuf; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_cfg_t *rl_cfg = (vcl_test_cfg_t *) socket->rxbuf; int rx_bytes, tx_bytes; if (socket->cfg.verbose) - sock_test_cfg_dump (&socket->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&socket->cfg, 1 /* is_client */ ); + ctrl->cfg.seq_num = ++scm->cfg_seq_num; + if (socket->cfg.verbose) + { + printf ("CLIENT (fd %d): Sending config sent to server.\n", socket->fd); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + } tx_bytes = sock_test_write (socket->fd, (uint8_t *) & ctrl->cfg, sizeof (ctrl->cfg), NULL, ctrl->cfg.verbose); if (tx_bytes < 0) { - fprintf (stderr, "ERROR: write test cfg failed (%d)!\n", tx_bytes); + fprintf (stderr, "CLIENT (fd %d): ERROR: write test cfg failed (%d)!\n", + socket->fd, tx_bytes); return tx_bytes; } rx_bytes = sock_test_read (socket->fd, (uint8_t *) socket->rxbuf, - sizeof (sock_test_cfg_t), NULL); + sizeof (vcl_test_cfg_t), NULL); if (rx_bytes < 0) return rx_bytes; - if (rl_cfg->magic != SOCK_TEST_CFG_CTRL_MAGIC) + if (rl_cfg->magic != VCL_TEST_CFG_CTRL_MAGIC) { - fprintf (stderr, "ERROR: Bad server reply cfg -- aborting!\n"); + fprintf (stderr, "CLIENT (fd %d): ERROR: Bad server reply cfg " + "-- aborting!\n", socket->fd); return -1; } - if (socket->cfg.verbose) + if ((rx_bytes != sizeof (vcl_test_cfg_t)) + || !vcl_test_cfg_verify (rl_cfg, &ctrl->cfg)) { - printf ("CLIENT (fd %d): Got config back from server.\n", socket->fd); - sock_test_cfg_dump (rl_cfg, 1 /* is_client */ ); + fprintf (stderr, "CLIENT (fd %d): ERROR: Invalid config received " + "from server!\n", socket->fd); + if (rx_bytes != sizeof (vcl_test_cfg_t)) + { + fprintf (stderr, "\tRx bytes %d != cfg size %lu\n", + rx_bytes, sizeof (vcl_test_cfg_t)); + } + else + { + vcl_test_cfg_dump (rl_cfg, 1 /* is_client */ ); + fprintf (stderr, "CLIENT (fd %d): Valid config sent to server.\n", + socket->fd); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + } + return -1; } - if ((rx_bytes != sizeof (sock_test_cfg_t)) - || !sock_test_cfg_verify (rl_cfg, &ctrl->cfg)) + else if (socket->cfg.verbose) { - fprintf (stderr, - "ERROR: Invalid config received from server -- aborting!\n"); - sock_test_cfg_dump (rl_cfg, 1 /* is_client */ ); - return -1; + printf ("CLIENT (fd %d): Got config back from server.\n", socket->fd); + vcl_test_cfg_dump (rl_cfg, 1 /* is_client */ ); } ctrl->cfg.ctrl_handle = ((ctrl->cfg.ctrl_handle == ~0) ? rl_cfg->ctrl_handle : ctrl->cfg.ctrl_handle); @@ -90,9 +117,9 @@ sock_test_cfg_sync (sock_test_socket_t * socket) static void echo_test_client () { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_socket_t *tsock; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_session_t *tsock; int rx_bytes, tx_bytes, nbytes; uint32_t i, n; int rv; @@ -105,12 +132,13 @@ echo_test_client () FD_ZERO (&rd_fdset); memset (&ctrl->stats, 0, sizeof (ctrl->stats)); ctrl->cfg.total_bytes = nbytes = strlen (ctrl->txbuf) + 1; - for (n = 0; n != ctrl->cfg.num_test_sockets; n++) + for (n = 0; n != ctrl->cfg.num_test_sessions; n++) { tsock = &scm->test_socket[n]; tsock->cfg = ctrl->cfg; - sock_test_socket_buf_alloc (tsock); - sock_test_cfg_sync (tsock); + vcl_test_session_buf_alloc (tsock); + if (sock_test_cfg_sync (tsock)) + return; memcpy (tsock->txbuf, ctrl->txbuf, nbytes); memset (&tsock->stats, 0, sizeof (tsock->stats)); @@ -141,13 +169,14 @@ echo_test_client () if (rv < 0) { perror ("select()"); - fprintf (stderr, "\nERROR: select() failed -- aborting test!\n"); + fprintf (stderr, "\nCLIENT: ERROR: select() failed -- " + "aborting test!\n"); return; } else if (rv == 0) continue; - for (i = 0; i < ctrl->cfg.num_test_sockets; i++) + for (i = 0; i < ctrl->cfg.num_test_sessions; i++) { tsock = &scm->test_socket[i]; if (!((tsock->stats.stop.tv_sec == 0) && @@ -163,8 +192,8 @@ echo_test_client () &tsock->stats, ctrl->cfg.verbose); if (tx_bytes < 0) { - fprintf (stderr, "\nERROR: sock_test_write(%d) failed " - "-- aborting test!\n", tsock->fd); + fprintf (stderr, "\nCLIENT: ERROR: sock_test_write(%d) " + "failed -- aborting test!\n", tsock->fd); return; } @@ -184,9 +213,9 @@ echo_test_client () tsock->fd, rx_bytes, tsock->rxbuf); if (tsock->stats.rx_bytes != tsock->stats.tx_bytes) - printf - ("WARNING: bytes read (%lu) != bytes written (%lu)!\n", - tsock->stats.rx_bytes, tsock->stats.tx_bytes); + printf ("CLIENT: WARNING: bytes read (%lu) " + "!= bytes written (%lu)!\n", + tsock->stats.rx_bytes, tsock->stats.tx_bytes); } } @@ -199,7 +228,95 @@ echo_test_client () } clock_gettime (CLOCK_REALTIME, &ctrl->stats.stop); - for (i = 0; i < ctrl->cfg.num_test_sockets; i++) +#ifndef VCL_TEST + { + int fd, errno_val; + struct sockaddr_un serveraddr; + uint8_t buffer[256]; + size_t nbytes = strlen (SOCK_TEST_MIXED_EPOLL_DATA) + 1; + struct timeval timeout; + + /* Open AF_UNIX socket and send an echo to test mixed epoll on server. + */ + fd = socket (AF_UNIX, SOCK_STREAM, 0); + if (fd < 0) + { + errno_val = errno; + perror ("ERROR in echo_test_client(): socket(AF_UNIX) failed"); + fprintf (stderr, + "CLIENT: ERROR: socket(AF_UNIX, SOCK_STREAM, 0) failed " + "(errno = %d)!\n", errno_val); + goto out; + } + memset (&serveraddr, 0, sizeof (serveraddr)); + serveraddr.sun_family = AF_UNIX; + strcpy (serveraddr.sun_path, SOCK_TEST_AF_UNIX_FILENAME); + rv = connect (fd, (struct sockaddr *) &serveraddr, SUN_LEN (&serveraddr)); + if (rv < 0) + { + errno_val = errno; + perror ("ERROR in echo_test_client(): connect() failed"); + fprintf (stderr, "CLIENT: ERROR: connect(fd %d, \"%s\", %lu) " + "failed (errno = %d)!\n", fd, SOCK_TEST_AF_UNIX_FILENAME, + SUN_LEN (&serveraddr), errno_val); + goto done; + } + + scm->af_unix_echo_tx++; + strcpy ((char *) buffer, SOCK_TEST_MIXED_EPOLL_DATA); + timeout.tv_sec = 0; + timeout.tv_usec = 250000; + select (0, NULL, NULL, NULL, &timeout); /* delay .25 secs */ + rv = write (fd, buffer, nbytes); + if (rv < 0) + { + errno_val = errno; + perror ("ERROR in echo_test_client(): write() failed"); + fprintf (stderr, "CLIENT: ERROR: write(fd %d, \"%s\", %lu) " + "failed (errno = %d)!\n", fd, buffer, nbytes, errno_val); + goto done; + } + else if (rv < nbytes) + { + fprintf (stderr, "CLIENT: ERROR: write(fd %d, \"%s\", %lu) " + "returned %d!\n", fd, buffer, nbytes, rv); + goto done; + } + + printf ("CLIENT (AF_UNIX): TX (%d bytes) - '%s'\n", rv, buffer); + memset (buffer, 0, sizeof (buffer)); + rv = read (fd, buffer, nbytes); + if (rv < 0) + { + errno_val = errno; + perror ("ERROR in echo_test_client(): read() failed"); + fprintf (stderr, "CLIENT: ERROR: read(fd %d, %p, %lu) " + "failed (errno = %d)!\n", fd, buffer, nbytes, errno_val); + goto done; + } + else if (rv < nbytes) + { + fprintf (stderr, "CLIENT: ERROR: read(fd %d, %p, %lu) " + "returned %d!\n", fd, buffer, nbytes, rv); + goto done; + } + + if (!strncmp (SOCK_TEST_MIXED_EPOLL_DATA, (const char *) buffer, nbytes)) + { + printf ("CLIENT (AF_UNIX): RX (%d bytes) - '%s'\n", rv, buffer); + scm->af_unix_echo_rx++; + } + else + printf ("CLIENT (AF_UNIX): ERROR: RX (%d bytes) - '%s'\n", rv, buffer); + + done: + close (fd); + out: + ; + } +#endif + + for (i = 0; i < ctrl->cfg.num_test_sessions; i++) { tsock = &scm->test_socket[i]; tsock->stats.start = ctrl->stats.start; @@ -209,31 +326,31 @@ echo_test_client () static char buf[64]; sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd); - sock_test_stats_dump (buf, &tsock->stats, - 1 /* show_rx */ , 1 /* show tx */ , - ctrl->cfg.verbose); + vcl_test_stats_dump (buf, &tsock->stats, + 1 /* show_rx */ , 1 /* show tx */ , + ctrl->cfg.verbose); } - sock_test_stats_accumulate (&ctrl->stats, &tsock->stats); + vcl_test_stats_accumulate (&ctrl->stats, &tsock->stats); } if (ctrl->cfg.verbose) { - sock_test_stats_dump ("CLIENT RESULTS", &ctrl->stats, - 1 /* show_rx */ , 1 /* show tx */ , - ctrl->cfg.verbose); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_stats_dump ("CLIENT RESULTS", &ctrl->stats, + 1 /* show_rx */ , 1 /* show tx */ , + ctrl->cfg.verbose); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); if (ctrl->cfg.verbose > 1) { printf (" ctrl socket info\n" - SOCK_TEST_SEPARATOR_STRING + VCL_TEST_SEPARATOR_STRING " fd: %d (0x%08x)\n" " rxbuf: %p\n" " rxbuf size: %u (0x%08x)\n" " txbuf: %p\n" " txbuf size: %u (0x%08x)\n" - SOCK_TEST_SEPARATOR_STRING, + VCL_TEST_SEPARATOR_STRING, ctrl->fd, (uint32_t) ctrl->fd, ctrl->rxbuf, ctrl->rxbuf_size, ctrl->rxbuf_size, ctrl->txbuf, ctrl->txbuf_size, ctrl->txbuf_size); @@ -242,18 +359,18 @@ echo_test_client () } static void -stream_test_client (sock_test_t test) +stream_test_client (vcl_test_t test) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_socket_t *tsock; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_session_t *tsock; int tx_bytes; uint32_t i, n; int rv; int nfds = 0; fd_set wr_fdset, rd_fdset; fd_set _wfdset, *wfdset = &_wfdset; - fd_set _rfdset, *rfdset = (test == SOCK_TEST_TYPE_BI) ? &_rfdset : 0; + fd_set _rfdset, *rfdset = (test == VCL_TEST_TYPE_BI) ? &_rfdset : 0; ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size; ctrl->cfg.ctrl_handle = ~0; @@ -261,22 +378,22 @@ stream_test_client (sock_test_t test) printf ("\n" SOCK_TEST_BANNER_STRING "CLIENT (fd %d): %s-directional Stream Test!\n\n" "CLIENT (fd %d): Sending config to server on ctrl socket...\n", - ctrl->fd, test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni", ctrl->fd); + ctrl->fd, test == VCL_TEST_TYPE_BI ? "Bi" : "Uni", ctrl->fd); if (sock_test_cfg_sync (ctrl)) { - fprintf (stderr, "ERROR: test cfg sync failed -- aborting!"); + fprintf (stderr, "CLIENT: ERROR: test cfg sync failed -- aborting!"); return; } FD_ZERO (&wr_fdset); FD_ZERO (&rd_fdset); memset (&ctrl->stats, 0, sizeof (ctrl->stats)); - for (n = 0; n != ctrl->cfg.num_test_sockets; n++) + for (n = 0; n != ctrl->cfg.num_test_sessions; n++) { tsock = &scm->test_socket[n]; tsock->cfg = ctrl->cfg; - sock_test_socket_buf_alloc (tsock); + vcl_test_session_buf_alloc (tsock); printf ("CLIENT (fd %d): Sending config to server on " "test socket %d...\n", tsock->fd, n); sock_test_cfg_sync (tsock); @@ -312,46 +429,46 @@ stream_test_client (sock_test_t test) if (rv < 0) { perror ("select()"); - fprintf (stderr, "\nERROR: select() failed -- aborting test!\n"); + fprintf (stderr, "\nCLIENT: ERROR: select() failed -- " + "aborting test!\n"); return; } else if (rv == 0) continue; - for (i = 0; i < ctrl->cfg.num_test_sockets; i++) + for (i = 0; i < ctrl->cfg.num_test_sessions; i++) { tsock = &scm->test_socket[i]; if (!((tsock->stats.stop.tv_sec == 0) && (tsock->stats.stop.tv_nsec == 0))) continue; + if ((test == VCL_TEST_TYPE_BI) && + FD_ISSET (tsock->fd, rfdset) && + (tsock->stats.rx_bytes < ctrl->cfg.total_bytes)) + { + (void) sock_test_read (tsock->fd, + (uint8_t *) tsock->rxbuf, + tsock->rxbuf_size, &tsock->stats); + } + if (FD_ISSET (tsock->fd, wfdset) && (tsock->stats.tx_bytes < ctrl->cfg.total_bytes)) { - tx_bytes = - sock_test_write (tsock->fd, (uint8_t *) tsock->txbuf, - ctrl->cfg.txbuf_size, &tsock->stats, - ctrl->cfg.verbose); + tx_bytes = sock_test_write (tsock->fd, (uint8_t *) tsock->txbuf, + ctrl->cfg.txbuf_size, &tsock->stats, + ctrl->cfg.verbose); if (tx_bytes < 0) { - fprintf (stderr, "\nERROR: sock_test_write(%d) failed " - "-- aborting test!\n", tsock->fd); + fprintf (stderr, "\nCLIENT: ERROR: sock_test_write(%d) " + "failed -- aborting test!\n", tsock->fd); return; } } - if ((test == SOCK_TEST_TYPE_BI) && - FD_ISSET (tsock->fd, rfdset) && - (tsock->stats.rx_bytes < ctrl->cfg.total_bytes)) - { - (void) sock_test_read (tsock->fd, - (uint8_t *) tsock->rxbuf, - tsock->rxbuf_size, &tsock->stats); - } - - if (((test == SOCK_TEST_TYPE_UNI) && + if (((test == VCL_TEST_TYPE_UNI) && (tsock->stats.tx_bytes >= ctrl->cfg.total_bytes)) || - ((test == SOCK_TEST_TYPE_BI) && + ((test == VCL_TEST_TYPE_BI) && (tsock->stats.rx_bytes >= ctrl->cfg.total_bytes))) { clock_gettime (CLOCK_REALTIME, &tsock->stats.stop); @@ -366,11 +483,11 @@ stream_test_client (sock_test_t test) if (sock_test_cfg_sync (ctrl)) { - fprintf (stderr, "ERROR: test cfg sync failed -- aborting!"); + fprintf (stderr, "CLIENT: ERROR: test cfg sync failed -- aborting!"); return; } - for (i = 0; i < ctrl->cfg.num_test_sockets; i++) + for (i = 0; i < ctrl->cfg.num_test_sessions; i++) { tsock = &scm->test_socket[i]; @@ -379,73 +496,77 @@ stream_test_client (sock_test_t test) static char buf[64]; sprintf (buf, "CLIENT (fd %d) RESULTS", tsock->fd); - sock_test_stats_dump (buf, &tsock->stats, - test == SOCK_TEST_TYPE_BI /* show_rx */ , - 1 /* show tx */ , ctrl->cfg.verbose); + vcl_test_stats_dump (buf, &tsock->stats, + test == VCL_TEST_TYPE_BI /* show_rx */ , + 1 /* show tx */ , ctrl->cfg.verbose); } - sock_test_stats_accumulate (&ctrl->stats, &tsock->stats); + vcl_test_stats_accumulate (&ctrl->stats, &tsock->stats); } - sock_test_stats_dump ("CLIENT RESULTS", &ctrl->stats, - test == SOCK_TEST_TYPE_BI /* show_rx */ , - 1 /* show tx */ , ctrl->cfg.verbose); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_stats_dump ("CLIENT RESULTS", &ctrl->stats, + test == VCL_TEST_TYPE_BI /* show_rx */ , + 1 /* show tx */ , ctrl->cfg.verbose); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); if (ctrl->cfg.verbose) { printf (" ctrl socket info\n" - SOCK_TEST_SEPARATOR_STRING + VCL_TEST_SEPARATOR_STRING " fd: %d (0x%08x)\n" " rxbuf: %p\n" " rxbuf size: %u (0x%08x)\n" " txbuf: %p\n" " txbuf size: %u (0x%08x)\n" - SOCK_TEST_SEPARATOR_STRING, + VCL_TEST_SEPARATOR_STRING, ctrl->fd, (uint32_t) ctrl->fd, ctrl->rxbuf, ctrl->rxbuf_size, ctrl->rxbuf_size, ctrl->txbuf, ctrl->txbuf_size, ctrl->txbuf_size); } - ctrl->cfg.test = SOCK_TEST_TYPE_ECHO; + ctrl->cfg.test = VCL_TEST_TYPE_ECHO; if (sock_test_cfg_sync (ctrl)) - fprintf (stderr, "ERROR: post-test cfg sync failed!"); + fprintf (stderr, "CLIENT: ERROR: post-test cfg sync failed!"); printf ("CLIENT (fd %d): %s-directional Stream Test Complete!\n" SOCK_TEST_BANNER_STRING "\n", ctrl->fd, - test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni"); + test == VCL_TEST_TYPE_BI ? "Bi" : "Uni"); } static void exit_client (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_socket_t *tsock; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_session_t *tsock; int i; - for (i = 0; i < ctrl->cfg.num_test_sockets; i++) +#ifndef VCL_TEST + printf ("CLIENT: af_unix_echo_tx %d, af_unix_echo_rx %d\n", + scm->af_unix_echo_tx, scm->af_unix_echo_rx); +#endif + for (i = 0; i < ctrl->cfg.num_test_sessions; i++) { tsock = &scm->test_socket[i]; - tsock->cfg.test = SOCK_TEST_TYPE_EXIT; + tsock->cfg.test = VCL_TEST_TYPE_EXIT; /* coverity[COPY_PASTE_ERROR] */ if (ctrl->cfg.verbose) { printf ("\nCLIENT (fd %d): Sending exit cfg to server...\n", tsock->fd); - sock_test_cfg_dump (&tsock->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&tsock->cfg, 1 /* is_client */ ); } (void) sock_test_write (tsock->fd, (uint8_t *) & tsock->cfg, sizeof (tsock->cfg), &tsock->stats, ctrl->cfg.verbose); } - ctrl->cfg.test = SOCK_TEST_TYPE_EXIT; + ctrl->cfg.test = VCL_TEST_TYPE_EXIT; if (ctrl->cfg.verbose) { printf ("\nCLIENT (fd %d): Sending exit cfg to server...\n", ctrl->fd); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } (void) sock_test_write (ctrl->fd, (uint8_t *) & ctrl->cfg, sizeof (ctrl->cfg), &ctrl->stats, @@ -457,9 +578,9 @@ exit_client (void) static int sock_test_connect_test_sockets (uint32_t num_test_sockets) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_socket_t *tsock; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_session_t *tsock; int i, rv, errno_val; if (num_test_sockets < 1) @@ -486,12 +607,13 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets) else if (num_test_sockets > scm->num_test_sockets) { tsock = realloc (scm->test_socket, - sizeof (sock_test_socket_t) * num_test_sockets); + sizeof (vcl_test_session_t) * num_test_sockets); if (!tsock) { errno_val = errno; perror ("ERROR in sock_test_connect_test_sockets()"); - fprintf (stderr, "ERROR: socket failed (errno = %d)!\n", errno_val); + fprintf (stderr, "CLIENT: ERROR: socket failed (errno = %d)!\n", + errno_val); return -1; } @@ -503,22 +625,25 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets) { tsock = &scm->test_socket[i]; #ifdef VCL_TEST - tsock->fd = - vppcom_session_create (VPPCOM_VRF_DEFAULT, VPPCOM_PROTO_TCP, - 1 /* is_nonblocking */ ); + tsock->fd = vppcom_session_create (ctrl->cfg.transport_udp ? + VPPCOM_PROTO_UDP : + VPPCOM_PROTO_TCP, + 1 /* is_nonblocking */ ); if (tsock->fd < 0) { errno = -tsock->fd; tsock->fd = -1; } #else - tsock->fd = socket (AF_INET, SOCK_STREAM, 0); + tsock->fd = socket (ctrl->cfg.address_ip6 ? AF_INET6 : AF_INET, + ctrl->cfg.transport_udp ? + SOCK_DGRAM : SOCK_STREAM, 0); #endif if (tsock->fd < 0) { errno_val = errno; perror ("ERROR in sock_test_connect_test_sockets()"); - fprintf (stderr, "ERROR: socket failed (errno = %d)!\n", + fprintf (stderr, "CLIENT: ERROR: socket failed (errno = %d)!\n", errno_val); return tsock->fd; } @@ -533,18 +658,18 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets) #else rv = connect (tsock->fd, (struct sockaddr *) &scm->server_addr, - sizeof (scm->server_addr)); + scm->server_addr_size); #endif if (rv < 0) { errno_val = errno; perror ("ERROR in sock_test_connect_test_sockets()"); - fprintf (stderr, "ERROR: connect failed (errno = %d)!\n", - errno_val); + fprintf (stderr, "CLIENT: ERROR: connect failed " + "(errno = %d)!\n", errno_val); return -1; } tsock->cfg = ctrl->cfg; - sock_test_socket_buf_alloc (tsock); + vcl_test_session_buf_alloc (tsock); sock_test_cfg_sync (tsock); printf ("CLIENT (fd %d): Test socket %d connected.\n", @@ -562,169 +687,174 @@ dump_help (void) { #define INDENT "\n " - printf ("Test configuration commands:" - INDENT SOCK_TEST_TOKEN_HELP + printf ("CLIENT: Test configuration commands:" + INDENT VCL_TEST_TOKEN_HELP "\t\t\tDisplay help." - INDENT SOCK_TEST_TOKEN_EXIT + INDENT VCL_TEST_TOKEN_EXIT "\t\t\tExit test client & server." - INDENT SOCK_TEST_TOKEN_SHOW_CFG + INDENT VCL_TEST_TOKEN_SHOW_CFG "\t\t\tShow the current test cfg." - INDENT SOCK_TEST_TOKEN_RUN_UNI + INDENT VCL_TEST_TOKEN_RUN_UNI "\t\t\tRun the Uni-directional test." - INDENT SOCK_TEST_TOKEN_RUN_BI + INDENT VCL_TEST_TOKEN_RUN_BI "\t\t\tRun the Bi-directional test." - INDENT SOCK_TEST_TOKEN_VERBOSE + INDENT VCL_TEST_TOKEN_VERBOSE "\t\t\tToggle verbose setting." - INDENT SOCK_TEST_TOKEN_RXBUF_SIZE + INDENT VCL_TEST_TOKEN_RXBUF_SIZE "\tRx buffer size (bytes)." - INDENT SOCK_TEST_TOKEN_TXBUF_SIZE + INDENT VCL_TEST_TOKEN_TXBUF_SIZE "\tTx buffer size (bytes)." - INDENT SOCK_TEST_TOKEN_NUM_WRITES + INDENT VCL_TEST_TOKEN_NUM_WRITES "<# of writes>\tNumber of txbuf writes to server." "\n"); } static void cfg_txbuf_size_set (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_TXBUF_SIZE); + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_TXBUF_SIZE); uint64_t txbuf_size = strtoull ((const char *) p, NULL, 10); - if (txbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN) + if (txbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN) { ctrl->cfg.txbuf_size = txbuf_size; ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size; - sock_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ , - (uint8_t **) & ctrl->txbuf, &ctrl->txbuf_size); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ , + (uint8_t **) & ctrl->txbuf, &ctrl->txbuf_size); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } else - fprintf (stderr, - "ERROR: Invalid txbuf size (%lu) < minimum buf size (%u)!\n", - txbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN); + fprintf (stderr, "CLIENT: ERROR: Invalid txbuf size (%lu) < " + "minimum buf size (%u)!\n", + txbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN); } static void cfg_num_writes_set (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_NUM_WRITES); + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_NUM_WRITES); uint32_t num_writes = strtoul ((const char *) p, NULL, 10); if (num_writes > 0) { ctrl->cfg.num_writes = num_writes; ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size; - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } else { - fprintf (stderr, "ERROR: invalid num writes: %u\n", num_writes); + fprintf (stderr, "CLIENT: ERROR: invalid num writes: %u\n", num_writes); } } static void cfg_num_test_sockets_set (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_NUM_TEST_SCKTS); + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_NUM_TEST_SESS); uint32_t num_test_sockets = strtoul ((const char *) p, NULL, 10); if ((num_test_sockets > 0) && - (num_test_sockets <= SOCK_TEST_CFG_MAX_TEST_SCKTS)) + (num_test_sockets <= VCL_TEST_CFG_MAX_TEST_SESS)) { - ctrl->cfg.num_test_sockets = num_test_sockets; + ctrl->cfg.num_test_sessions = num_test_sockets; sock_test_connect_test_sockets (num_test_sockets); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } else { - fprintf (stderr, "ERROR: invalid num test sockets: %u, (%d max)\n", - num_test_sockets, SOCK_TEST_CFG_MAX_TEST_SCKTS); + fprintf (stderr, "CLIENT: ERROR: invalid num test sockets: " + "%u, (%d max)\n", + num_test_sockets, VCL_TEST_CFG_MAX_TEST_SESS); } } static void cfg_rxbuf_size_set (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - char *p = ctrl->txbuf + strlen (SOCK_TEST_TOKEN_RXBUF_SIZE); + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + char *p = ctrl->txbuf + strlen (VCL_TEST_TOKEN_RXBUF_SIZE); uint64_t rxbuf_size = strtoull ((const char *) p, NULL, 10); - if (rxbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN) + if (rxbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN) { ctrl->cfg.rxbuf_size = rxbuf_size; - sock_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ , - (uint8_t **) & ctrl->rxbuf, &ctrl->rxbuf_size); - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ , + (uint8_t **) & ctrl->rxbuf, &ctrl->rxbuf_size); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } else - fprintf (stderr, - "ERROR: Invalid rxbuf size (%lu) < minimum buf size (%u)!\n", - rxbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN); + fprintf (stderr, "CLIENT: ERROR: Invalid rxbuf size (%lu) < " + "minimum buf size (%u)!\n", + rxbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN); } static void cfg_verbose_toggle (void) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; ctrl->cfg.verbose = ctrl->cfg.verbose ? 0 : 1; - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); } -static sock_test_t +static vcl_test_t parse_input () { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; - sock_test_t rv = SOCK_TEST_TYPE_NONE; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; + vcl_test_t rv = VCL_TEST_TYPE_NONE; - if (!strcmp (SOCK_TEST_TOKEN_EXIT, ctrl->txbuf)) - rv = SOCK_TEST_TYPE_EXIT; + if (!strncmp (VCL_TEST_TOKEN_EXIT, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_EXIT))) + rv = VCL_TEST_TYPE_EXIT; - else if (!strcmp (SOCK_TEST_TOKEN_HELP, ctrl->txbuf)) + else if (!strncmp (VCL_TEST_TOKEN_HELP, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_HELP))) dump_help (); - else if (!strcmp (SOCK_TEST_TOKEN_SHOW_CFG, ctrl->txbuf)) + else if (!strncmp (VCL_TEST_TOKEN_SHOW_CFG, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_SHOW_CFG))) scm->dump_cfg = 1; - else if (!strcmp (SOCK_TEST_TOKEN_VERBOSE, ctrl->txbuf)) + else if (!strncmp (VCL_TEST_TOKEN_VERBOSE, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_VERBOSE))) cfg_verbose_toggle (); - else if (!strncmp (SOCK_TEST_TOKEN_TXBUF_SIZE, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_TXBUF_SIZE))) + else if (!strncmp (VCL_TEST_TOKEN_TXBUF_SIZE, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_TXBUF_SIZE))) cfg_txbuf_size_set (); - else if (!strncmp (SOCK_TEST_TOKEN_NUM_TEST_SCKTS, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_NUM_TEST_SCKTS))) + else if (!strncmp (VCL_TEST_TOKEN_NUM_TEST_SESS, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_NUM_TEST_SESS))) cfg_num_test_sockets_set (); - else if (!strncmp (SOCK_TEST_TOKEN_NUM_WRITES, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_NUM_WRITES))) + else if (!strncmp (VCL_TEST_TOKEN_NUM_WRITES, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_NUM_WRITES))) cfg_num_writes_set (); - else if (!strncmp (SOCK_TEST_TOKEN_RXBUF_SIZE, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_RXBUF_SIZE))) + else if (!strncmp (VCL_TEST_TOKEN_RXBUF_SIZE, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_RXBUF_SIZE))) cfg_rxbuf_size_set (); - else if (!strncmp (SOCK_TEST_TOKEN_RUN_UNI, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_RUN_UNI))) - rv = ctrl->cfg.test = SOCK_TEST_TYPE_UNI; + else if (!strncmp (VCL_TEST_TOKEN_RUN_UNI, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_RUN_UNI))) + rv = ctrl->cfg.test = VCL_TEST_TYPE_UNI; - else if (!strncmp (SOCK_TEST_TOKEN_RUN_BI, ctrl->txbuf, - strlen (SOCK_TEST_TOKEN_RUN_BI))) - rv = ctrl->cfg.test = SOCK_TEST_TYPE_BI; + else if (!strncmp (VCL_TEST_TOKEN_RUN_BI, ctrl->txbuf, + strlen (VCL_TEST_TOKEN_RUN_BI))) + rv = ctrl->cfg.test = VCL_TEST_TYPE_BI; else - rv = SOCK_TEST_TYPE_ECHO; + rv = VCL_TEST_TYPE_ECHO; return rv; } @@ -736,6 +866,8 @@ print_usage_and_exit (void) "sock_test_client [OPTIONS] \n" " OPTIONS\n" " -h Print this message and exit.\n" + " -6 Use IPv6\n" + " -u Use UDP transport layer\n" " -c Print test config before test.\n" " -w Write test results to .\n" " -X Exit after running test.\n" @@ -752,16 +884,16 @@ print_usage_and_exit (void) int main (int argc, char **argv) { - sock_client_main_t *scm = &sock_client_main; - sock_test_socket_t *ctrl = &scm->ctrl_socket; + sock_client_main_t *scm = &vcl_client_main; + vcl_test_session_t *ctrl = &scm->ctrl_socket; int c, rv, errno_val; - sock_test_t post_test = SOCK_TEST_TYPE_NONE; + vcl_test_t post_test = VCL_TEST_TYPE_NONE; - sock_test_cfg_init (&ctrl->cfg); - sock_test_socket_buf_alloc (ctrl); + vcl_test_cfg_init (&ctrl->cfg); + vcl_test_session_buf_alloc (ctrl); opterr = 0; - while ((c = getopt (argc, argv, "chn:w:XE:I:N:R:T:UBV")) != -1) + while ((c = getopt (argc, argv, "chn:w:XE:I:N:R:T:UBV6D")) != -1) switch (c) { case 'c': @@ -769,54 +901,56 @@ main (int argc, char **argv) break; case 's': - if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sockets) != 1) - if (sscanf (optarg, "%u", &ctrl->cfg.num_test_sockets) != 1) + if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sessions) != 1) + if (sscanf (optarg, "%u", &ctrl->cfg.num_test_sessions) != 1) { - fprintf (stderr, "ERROR: Invalid value for option -%c!\n", c); + fprintf (stderr, "CLIENT: ERROR: Invalid value for " + "option -%c!\n", c); print_usage_and_exit (); } - if (!ctrl->cfg.num_test_sockets || - (ctrl->cfg.num_test_sockets > FD_SETSIZE)) + if (!ctrl->cfg.num_test_sessions || + (ctrl->cfg.num_test_sessions > FD_SETSIZE)) { - fprintf (stderr, "ERROR: Invalid number of sockets (%d)" - "specified for option -%c!\n" + fprintf (stderr, "CLIENT: ERROR: Invalid number of " + "sockets (%d) specified for option -%c!\n" " Valid range is 1 - %d\n", - ctrl->cfg.num_test_sockets, c, FD_SETSIZE); + ctrl->cfg.num_test_sessions, c, FD_SETSIZE); print_usage_and_exit (); } break; case 'w': - fprintf (stderr, "Writing test results to files is TBD.\n"); + fprintf (stderr, "CLIENT: Writing test results to files is TBD.\n"); break; case 'X': - post_test = SOCK_TEST_TYPE_EXIT; + post_test = VCL_TEST_TYPE_EXIT; break; case 'E': if (strlen (optarg) > ctrl->txbuf_size) { - fprintf (stderr, - "ERROR: Option -%c value larger than txbuf size (%d)!\n", + fprintf (stderr, "CLIENT: ERROR: Option -%c value " + "larger than txbuf size (%d)!\n", optopt, ctrl->txbuf_size); print_usage_and_exit (); } strcpy (ctrl->txbuf, optarg); - ctrl->cfg.test = SOCK_TEST_TYPE_ECHO; + ctrl->cfg.test = VCL_TEST_TYPE_ECHO; break; case 'I': - if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sockets) != 1) - if (sscanf (optarg, "%d", &ctrl->cfg.num_test_sockets) != 1) + if (sscanf (optarg, "0x%x", &ctrl->cfg.num_test_sessions) != 1) + if (sscanf (optarg, "%d", &ctrl->cfg.num_test_sessions) != 1) { - fprintf (stderr, "ERROR: Invalid value for option -%c!\n", c); + fprintf (stderr, "CLIENT: ERROR: Invalid value for " + "option -%c!\n", c); print_usage_and_exit (); } - if (ctrl->cfg.num_test_sockets > SOCK_TEST_CFG_MAX_TEST_SCKTS) + if (ctrl->cfg.num_test_sessions > VCL_TEST_CFG_MAX_TEST_SESS) { - fprintf (stderr, "ERROR: value greater than max number test" - " sockets (%d)!", SOCK_TEST_CFG_MAX_TEST_SCKTS); + fprintf (stderr, "CLIENT: ERROR: value greater than max " + "number test sockets (%d)!", VCL_TEST_CFG_MAX_TEST_SESS); print_usage_and_exit (); } break; @@ -825,7 +959,8 @@ main (int argc, char **argv) if (sscanf (optarg, "0x%lx", &ctrl->cfg.num_writes) != 1) if (sscanf (optarg, "%ld", &ctrl->cfg.num_writes) != 1) { - fprintf (stderr, "ERROR: Invalid value for option -%c!\n", c); + fprintf (stderr, "CLIENT: ERROR: Invalid value for " + "option -%c!\n", c); print_usage_and_exit (); } ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size; @@ -835,21 +970,22 @@ main (int argc, char **argv) if (sscanf (optarg, "0x%lx", &ctrl->cfg.rxbuf_size) != 1) if (sscanf (optarg, "%ld", &ctrl->cfg.rxbuf_size) != 1) { - fprintf (stderr, "ERROR: Invalid value for option -%c!\n", c); + fprintf (stderr, "CLIENT: ERROR: Invalid value for " + "option -%c!\n", c); print_usage_and_exit (); } - if (ctrl->cfg.rxbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN) + if (ctrl->cfg.rxbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN) { ctrl->rxbuf_size = ctrl->cfg.rxbuf_size; - sock_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ , - (uint8_t **) & ctrl->rxbuf, - &ctrl->rxbuf_size); + vcl_test_buf_alloc (&ctrl->cfg, 1 /* is_rxbuf */ , + (uint8_t **) & ctrl->rxbuf, + &ctrl->rxbuf_size); } else { - fprintf (stderr, - "ERROR: rxbuf size (%lu) less than minumum (%u)\n", - ctrl->cfg.rxbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN); + fprintf (stderr, "CLIENT: ERROR: rxbuf size (%lu) " + "less than minumum (%u)\n", + ctrl->cfg.rxbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN); print_usage_and_exit (); } @@ -859,39 +995,48 @@ main (int argc, char **argv) if (sscanf (optarg, "0x%lx", &ctrl->cfg.txbuf_size) != 1) if (sscanf (optarg, "%ld", &ctrl->cfg.txbuf_size) != 1) { - fprintf (stderr, "ERROR: Invalid value for option -%c!\n", c); + fprintf (stderr, "CLIENT: ERROR: Invalid value " + "for option -%c!\n", c); print_usage_and_exit (); } - if (ctrl->cfg.txbuf_size >= SOCK_TEST_CFG_BUF_SIZE_MIN) + if (ctrl->cfg.txbuf_size >= VCL_TEST_CFG_BUF_SIZE_MIN) { ctrl->txbuf_size = ctrl->cfg.txbuf_size; - sock_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ , - (uint8_t **) & ctrl->txbuf, - &ctrl->txbuf_size); + vcl_test_buf_alloc (&ctrl->cfg, 0 /* is_rxbuf */ , + (uint8_t **) & ctrl->txbuf, + &ctrl->txbuf_size); ctrl->cfg.total_bytes = ctrl->cfg.num_writes * ctrl->cfg.txbuf_size; } else { - fprintf (stderr, - "ERROR: txbuf size (%lu) less than minumum (%u)!\n", - ctrl->cfg.txbuf_size, SOCK_TEST_CFG_BUF_SIZE_MIN); + fprintf (stderr, "CLIENT: ERROR: txbuf size (%lu) " + "less than minumum (%u)!\n", + ctrl->cfg.txbuf_size, VCL_TEST_CFG_BUF_SIZE_MIN); print_usage_and_exit (); } break; case 'U': - ctrl->cfg.test = SOCK_TEST_TYPE_UNI; + ctrl->cfg.test = VCL_TEST_TYPE_UNI; break; case 'B': - ctrl->cfg.test = SOCK_TEST_TYPE_BI; + ctrl->cfg.test = VCL_TEST_TYPE_BI; break; case 'V': ctrl->cfg.verbose = 1; break; + case '6': + ctrl->cfg.address_ip6 = 1; + break; + + case 'D': + ctrl->cfg.transport_udp = 1; + break; + case '?': switch (optopt) { @@ -901,16 +1046,17 @@ main (int argc, char **argv) case 'R': case 'T': case 'w': - fprintf (stderr, "ERROR: Option -%c requires an argument.\n", - optopt); + fprintf (stderr, "CLIENT: ERROR: Option -%c " + "requires an argument.\n", optopt); break; default: if (isprint (optopt)) - fprintf (stderr, "ERROR: Unknown option `-%c'.\n", optopt); + fprintf (stderr, "CLIENT: ERROR: Unknown " + "option `-%c'.\n", optopt); else - fprintf (stderr, "ERROR: Unknown option character `\\x%x'.\n", - optopt); + fprintf (stderr, "CLIENT: ERROR: Unknown " + "option character `\\x%x'.\n", optopt); } /* fall thru */ case 'h': @@ -920,7 +1066,7 @@ main (int argc, char **argv) if (argc < (optind + 2)) { - fprintf (stderr, "ERROR: Insufficient number of arguments!\n"); + fprintf (stderr, "CLIENT: ERROR: Insufficient number of arguments!\n"); print_usage_and_exit (); } @@ -933,7 +1079,9 @@ main (int argc, char **argv) } else { - ctrl->fd = vppcom_session_create (VPPCOM_VRF_DEFAULT, VPPCOM_PROTO_TCP, + ctrl->fd = vppcom_session_create (ctrl->cfg.transport_udp ? + VPPCOM_PROTO_UDP : + VPPCOM_PROTO_TCP, 0 /* is_nonblocking */ ); if (ctrl->fd < 0) { @@ -942,28 +1090,56 @@ main (int argc, char **argv) } } #else - ctrl->fd = socket (AF_INET, SOCK_STREAM, 0); + ctrl->fd = socket (ctrl->cfg.address_ip6 ? AF_INET6 : AF_INET, + ctrl->cfg.transport_udp ? SOCK_DGRAM : SOCK_STREAM, 0); #endif if (ctrl->fd < 0) { errno_val = errno; perror ("ERROR in main()"); - fprintf (stderr, "ERROR: socket failed (errno = %d)!\n", errno_val); + fprintf (stderr, "CLIENT: ERROR: socket " + "failed (errno = %d)!\n", errno_val); return ctrl->fd; } memset (&scm->server_addr, 0, sizeof (scm->server_addr)); - - scm->server_addr.sin_family = AF_INET; - inet_pton (AF_INET, argv[optind++], &(scm->server_addr.sin_addr)); - scm->server_addr.sin_port = htons (atoi (argv[optind])); + if (ctrl->cfg.address_ip6) + { + struct sockaddr_in6 *server_addr = + (struct sockaddr_in6 *) &scm->server_addr; + scm->server_addr_size = sizeof (*server_addr); + server_addr->sin6_family = AF_INET6; + inet_pton (AF_INET6, argv[optind++], &(server_addr->sin6_addr)); + server_addr->sin6_port = htons (atoi (argv[optind])); + } + else + { + struct sockaddr_in *server_addr = + (struct sockaddr_in *) &scm->server_addr; + scm->server_addr_size = sizeof (*server_addr); + server_addr->sin_family = AF_INET; + inet_pton (AF_INET, argv[optind++], &(server_addr->sin_addr)); + server_addr->sin_port = htons (atoi (argv[optind])); + } #ifdef VCL_TEST - scm->server_endpt.vrf = VPPCOM_VRF_DEFAULT; - scm->server_endpt.is_ip4 = (scm->server_addr.sin_family == AF_INET); - scm->server_endpt.ip = (uint8_t *) & scm->server_addr.sin_addr; - scm->server_endpt.port = (uint16_t) scm->server_addr.sin_port; + if (ctrl->cfg.address_ip6) + { + struct sockaddr_in6 *server_addr = + (struct sockaddr_in6 *) &scm->server_addr; + scm->server_endpt.is_ip4 = 0; + scm->server_endpt.ip = (uint8_t *) & server_addr->sin6_addr; + scm->server_endpt.port = (uint16_t) server_addr->sin6_port; + } + else + { + struct sockaddr_in *server_addr = + (struct sockaddr_in *) &scm->server_addr; + scm->server_endpt.is_ip4 = 1; + scm->server_endpt.ip = (uint8_t *) & server_addr->sin_addr; + scm->server_endpt.port = (uint16_t) server_addr->sin_port; + } #endif do @@ -980,13 +1156,13 @@ main (int argc, char **argv) #else rv = connect (ctrl->fd, (struct sockaddr *) &scm->server_addr, - sizeof (scm->server_addr)); + scm->server_addr_size); #endif if (rv < 0) { errno_val = errno; perror ("ERROR in main()"); - fprintf (stderr, "ERROR: connect failed (errno = %d)!\n", + fprintf (stderr, "CLIENT: ERROR: connect failed (errno = %d)!\n", errno_val); return -1; } @@ -996,56 +1172,56 @@ main (int argc, char **argv) } while (rv < 0); - sock_test_connect_test_sockets (ctrl->cfg.num_test_sockets); + sock_test_connect_test_sockets (ctrl->cfg.num_test_sessions); - while (ctrl->cfg.test != SOCK_TEST_TYPE_EXIT) + while (ctrl->cfg.test != VCL_TEST_TYPE_EXIT) { if (scm->dump_cfg) { - sock_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); + vcl_test_cfg_dump (&ctrl->cfg, 1 /* is_client */ ); scm->dump_cfg = 0; } switch (ctrl->cfg.test) { - case SOCK_TEST_TYPE_ECHO: + case VCL_TEST_TYPE_ECHO: echo_test_client (); break; - case SOCK_TEST_TYPE_UNI: - case SOCK_TEST_TYPE_BI: + case VCL_TEST_TYPE_UNI: + case VCL_TEST_TYPE_BI: stream_test_client (ctrl->cfg.test); break; - case SOCK_TEST_TYPE_EXIT: + case VCL_TEST_TYPE_EXIT: continue; - case SOCK_TEST_TYPE_NONE: + case VCL_TEST_TYPE_NONE: default: break; } switch (post_test) { - case SOCK_TEST_TYPE_EXIT: + case VCL_TEST_TYPE_EXIT: switch (ctrl->cfg.test) { - case SOCK_TEST_TYPE_EXIT: - case SOCK_TEST_TYPE_UNI: - case SOCK_TEST_TYPE_BI: - case SOCK_TEST_TYPE_ECHO: - ctrl->cfg.test = SOCK_TEST_TYPE_EXIT; + case VCL_TEST_TYPE_EXIT: + case VCL_TEST_TYPE_UNI: + case VCL_TEST_TYPE_BI: + case VCL_TEST_TYPE_ECHO: + ctrl->cfg.test = VCL_TEST_TYPE_EXIT; continue; - case SOCK_TEST_TYPE_NONE: + case VCL_TEST_TYPE_NONE: default: break; } break; - case SOCK_TEST_TYPE_NONE: - case SOCK_TEST_TYPE_ECHO: - case SOCK_TEST_TYPE_UNI: - case SOCK_TEST_TYPE_BI: + case VCL_TEST_TYPE_NONE: + case VCL_TEST_TYPE_ECHO: + case VCL_TEST_TYPE_UNI: + case VCL_TEST_TYPE_BI: default: break; } @@ -1053,8 +1229,8 @@ main (int argc, char **argv) memset (ctrl->txbuf, 0, ctrl->txbuf_size); memset (ctrl->rxbuf, 0, ctrl->rxbuf_size); - printf ("\nType some characters and hit \n" - "('" SOCK_TEST_TOKEN_HELP "' for help): "); + printf ("\nCLIENT: Type some characters and hit \n" + "('" VCL_TEST_TOKEN_HELP "' for help): "); if (fgets (ctrl->txbuf, ctrl->txbuf_size, stdin) != NULL) { @@ -1074,10 +1250,11 @@ main (int argc, char **argv) #ifdef VCL_TEST vppcom_session_close (ctrl->fd); vppcom_app_destroy (); + return 0; #else close (ctrl->fd); + return (scm->af_unix_echo_tx == scm->af_unix_echo_rx) ? 0 : -1; #endif - return 0; } /*