X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fsock_test_server.c;h=11c667c217295bb1f3f72fe35f4b3ad07f211d93;hb=c1f5a43;hp=c0baefa99dea06d00fdbd584bfd47b545c4d33c0;hpb=3ee1fe1608cca9f000bed59ba987c864adf37cd6;p=vpp.git diff --git a/src/vcl/sock_test_server.c b/src/vcl/sock_test_server.c index c0baefa99de..11c667c2172 100644 --- a/src/vcl/sock_test_server.c +++ b/src/vcl/sock_test_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #define SOCK_SERVER_USE_EPOLL 1 #define VPPCOM_SESSION_ATTR_UNIT_TEST 0 @@ -50,19 +51,27 @@ typedef struct int fd; uint8_t *buf; uint32_t buf_size; - sock_test_cfg_t cfg; - sock_test_stats_t stats; + vcl_test_cfg_t cfg; + vcl_test_stats_t stats; #ifdef VCL_TEST vppcom_endpt_t endpt; uint8_t ip[16]; #endif } sock_server_conn_t; +typedef struct +{ + uint32_t port; + uint32_t address_ip6; + uint32_t transport_udp; +} sock_server_cfg_t; + #define SOCK_SERVER_MAX_TEST_CONN 10 #define SOCK_SERVER_MAX_EPOLL_EVENTS 10 typedef struct { int listen_fd; + sock_server_cfg_t cfg; #if SOCK_SERVER_USE_EPOLL int epfd; struct epoll_event listen_ev; @@ -135,9 +144,9 @@ conn_pool_expand (size_t expand_size) { sock_server_conn_t *conn = &conn_pool[i]; memset (conn, 0, sizeof (*conn)); - sock_test_cfg_init (&conn->cfg); - sock_test_buf_alloc (&conn->cfg, 1 /* is_rxbuf */ , - &conn->buf, &conn->buf_size); + vcl_test_cfg_init (&conn->cfg); + vcl_test_buf_alloc (&conn->cfg, 1 /* is_rxbuf */ , + &conn->buf, &conn->buf_size); conn->cfg.txbuf_size = conn->cfg.rxbuf_size; } @@ -188,17 +197,17 @@ conn_pool_free (sock_server_conn_t * conn) } static inline void -sync_config_and_reply (sock_server_conn_t * conn, sock_test_cfg_t * rx_cfg) +sync_config_and_reply (sock_server_conn_t * conn, vcl_test_cfg_t * rx_cfg) { conn->cfg = *rx_cfg; - sock_test_buf_alloc (&conn->cfg, 1 /* is_rxbuf */ , - &conn->buf, &conn->buf_size); + vcl_test_buf_alloc (&conn->cfg, 1 /* is_rxbuf */ , + &conn->buf, &conn->buf_size); conn->cfg.txbuf_size = conn->cfg.rxbuf_size; if (conn->cfg.verbose) { printf ("\nSERVER (fd %d): Replying to cfg message!\n", conn->fd); - sock_test_cfg_dump (&conn->cfg, 0 /* is_client */ ); + vcl_test_cfg_dump (&conn->cfg, 0 /* is_client */ ); } (void) sock_test_write (conn->fd, (uint8_t *) & conn->cfg, sizeof (conn->cfg), NULL, conn->cfg.verbose); @@ -206,11 +215,11 @@ sync_config_and_reply (sock_server_conn_t * conn, sock_test_cfg_t * rx_cfg) static void stream_test_server_start_stop (sock_server_conn_t * conn, - sock_test_cfg_t * rx_cfg) + vcl_test_cfg_t * rx_cfg) { sock_server_main_t *ssm = &sock_server_main; int client_fd = conn->fd; - sock_test_t test = rx_cfg->test; + vcl_test_t test = rx_cfg->test; if (rx_cfg->ctrl_handle == conn->fd) { @@ -223,46 +232,46 @@ stream_test_server_start_stop (sock_server_conn_t * conn, if (tc->cfg.ctrl_handle == conn->fd) { - sock_test_stats_accumulate (&conn->stats, &tc->stats); + vcl_test_stats_accumulate (&conn->stats, &tc->stats); if (conn->cfg.verbose) { static char buf[64]; sprintf (buf, "SERVER (fd %d) RESULTS", tc->fd); - sock_test_stats_dump (buf, &tc->stats, 1 /* show_rx */ , - test == SOCK_TEST_TYPE_BI - /* show tx */ , - conn->cfg.verbose); + vcl_test_stats_dump (buf, &tc->stats, 1 /* show_rx */ , + test == VCL_TEST_TYPE_BI + /* show tx */ , + conn->cfg.verbose); } } } - sock_test_stats_dump ("SERVER RESULTS", &conn->stats, 1 /* show_rx */ , - (test == SOCK_TEST_TYPE_BI) /* show_tx */ , - conn->cfg.verbose); - sock_test_cfg_dump (&conn->cfg, 0 /* is_client */ ); + vcl_test_stats_dump ("SERVER RESULTS", &conn->stats, 1 /* show_rx */ , + (test == VCL_TEST_TYPE_BI) /* show_tx */ , + conn->cfg.verbose); + vcl_test_cfg_dump (&conn->cfg, 0 /* is_client */ ); if (conn->cfg.verbose) { printf (" sock server main\n" - SOCK_TEST_SEPARATOR_STRING + VCL_TEST_SEPARATOR_STRING " buf: %p\n" " buf size: %u (0x%08x)\n" - SOCK_TEST_SEPARATOR_STRING, + VCL_TEST_SEPARATOR_STRING, conn->buf, conn->buf_size, conn->buf_size); } sync_config_and_reply (conn, rx_cfg); printf ("\nSERVER (fd %d): %s-directional Stream Test Complete!\n" SOCK_TEST_BANNER_STRING "\n", conn->fd, - test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni"); + test == VCL_TEST_TYPE_BI ? "Bi" : "Uni"); } else { printf ("\n" SOCK_TEST_BANNER_STRING "SERVER (fd %d): %s-directional Stream Test!\n" " Sending client the test cfg to start streaming data...\n", - client_fd, test == SOCK_TEST_TYPE_BI ? "Bi" : "Uni"); + client_fd, test == VCL_TEST_TYPE_BI ? "Bi" : "Uni"); rx_cfg->ctrl_handle = (rx_cfg->ctrl_handle == ~0) ? conn->fd : rx_cfg->ctrl_handle; @@ -280,9 +289,9 @@ static inline void stream_test_server (sock_server_conn_t * conn, int rx_bytes) { int client_fd = conn->fd; - sock_test_t test = conn->cfg.test; + vcl_test_t test = conn->cfg.test; - if (test == SOCK_TEST_TYPE_BI) + if (test == VCL_TEST_TYPE_BI) (void) sock_test_write (client_fd, conn->buf, rx_bytes, &conn->stats, conn->cfg.verbose); @@ -433,6 +442,18 @@ new_client (void) #endif } +void +print_usage_and_exit (void) +{ + fprintf (stderr, + "sock_test_server [OPTIONS] \n" + " OPTIONS\n" + " -h Print this message and exit.\n" + " -6 Use IPv6\n" + " -u Use UDP transport layer\n"); + exit (1); +} + int main (int argc, char **argv) { @@ -440,26 +461,67 @@ main (int argc, char **argv) int client_fd, rv, main_rv = 0; int tx_bytes, rx_bytes, nbytes; sock_server_conn_t *conn; - sock_test_cfg_t *rx_cfg; + vcl_test_cfg_t *rx_cfg; uint32_t xtra = 0; uint64_t xtra_bytes = 0; - struct sockaddr_in servaddr; + struct sockaddr_storage servaddr; int errno_val; - int v, i; - uint16_t port = SOCK_TEST_SERVER_PORT; + int c, v, i; + uint16_t port = VCL_TEST_SERVER_PORT; #if ! SOCK_SERVER_USE_EPOLL fd_set _rfdset, *rfdset = &_rfdset; #endif #ifdef VCL_TEST vppcom_endpt_t endpt; #else + uint32_t servaddr_size; #if ! SOCK_SERVER_USE_EPOLL fd_set _wfdset, *wfdset = &_wfdset; #endif #endif - if ((argc == 2) && (sscanf (argv[1], "%d", &v) == 1)) + opterr = 0; + while ((c = getopt (argc, argv, "6D")) != -1) + switch (c) + { + case '6': + ssm->cfg.address_ip6 = 1; + break; + + case 'D': + ssm->cfg.transport_udp = 1; + break; + + case '?': + switch (optopt) + { + default: + if (isprint (optopt)) + fprintf (stderr, "SERVER: ERROR: Unknown " + "option `-%c'.\n", optopt); + else + fprintf (stderr, "SERVER: ERROR: Unknown " + "option character `\\x%x'.\n", optopt); + } + /* fall thru */ + case 'h': + default: + print_usage_and_exit (); + } + + if (argc < (optind + 1)) + { + fprintf (stderr, "SERVER: ERROR: Insufficient number of arguments!\n"); + print_usage_and_exit (); + } + + if (sscanf (argv[optind], "%d", &v) == 1) port = (uint16_t) v; + else + { + fprintf (stderr, "SERVER: ERROR: Invalid port (%s)!\n", argv[optind]); + print_usage_and_exit (); + } conn_pool_expand (SOCK_SERVER_MAX_TEST_CONN + 1); @@ -472,11 +534,15 @@ main (int argc, char **argv) } else { - ssm->listen_fd = - vppcom_session_create (VPPCOM_PROTO_TCP, 0 /* is_nonblocking */ ); + ssm->listen_fd = vppcom_session_create (ssm->cfg.transport_udp ? + VPPCOM_PROTO_UDP : + VPPCOM_PROTO_TCP, + 0 /* is_nonblocking */ ); } #else - ssm->listen_fd = socket (AF_INET, SOCK_STREAM, 0); + ssm->listen_fd = socket (ssm->cfg.address_ip6 ? AF_INET6 : AF_INET, + ssm->cfg.transport_udp ? SOCK_DGRAM : SOCK_STREAM, + 0); #if SOCK_SERVER_USE_EPOLL && !defined (VCL_TEST) unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME); ssm->af_unix_listen_fd = socket (AF_UNIX, SOCK_STREAM, 0); @@ -533,14 +599,42 @@ main (int argc, char **argv) memset (&servaddr, 0, sizeof (servaddr)); - servaddr.sin_family = AF_INET; - servaddr.sin_addr.s_addr = htonl (INADDR_ANY); - servaddr.sin_port = htons (port); + if (ssm->cfg.address_ip6) + { + struct sockaddr_in6 *server_addr = (struct sockaddr_in6 *) &servaddr; +#ifndef VCL_TEST + servaddr_size = sizeof (*server_addr); +#endif + server_addr->sin6_family = AF_INET6; + server_addr->sin6_addr = in6addr_any; + server_addr->sin6_port = htons (port); + } + else + { + struct sockaddr_in *server_addr = (struct sockaddr_in *) &servaddr; +#ifndef VCL_TEST + servaddr_size = sizeof (*server_addr); +#endif + server_addr->sin_family = AF_INET; + server_addr->sin_addr.s_addr = htonl (INADDR_ANY); + server_addr->sin_port = htons (port); + } #ifdef VCL_TEST - endpt.is_ip4 = (servaddr.sin_family == AF_INET); - endpt.ip = (uint8_t *) & servaddr.sin_addr; - endpt.port = (uint16_t) servaddr.sin_port; + if (ssm->cfg.address_ip6) + { + struct sockaddr_in6 *server_addr = (struct sockaddr_in6 *) &servaddr; + endpt.is_ip4 = 0; + endpt.ip = (uint8_t *) & server_addr->sin6_addr; + endpt.port = (uint16_t) server_addr->sin6_port; + } + else + { + struct sockaddr_in *server_addr = (struct sockaddr_in *) &servaddr; + endpt.is_ip4 = 1; + endpt.ip = (uint8_t *) & server_addr->sin_addr; + endpt.port = (uint16_t) server_addr->sin_port; + } rv = vppcom_session_bind (ssm->listen_fd, &endpt); if (rv) @@ -549,8 +643,7 @@ main (int argc, char **argv) rv = -1; } #else - rv = - bind (ssm->listen_fd, (struct sockaddr *) &servaddr, sizeof (servaddr)); + rv = bind (ssm->listen_fd, (struct sockaddr *) &servaddr, servaddr_size); #endif if (rv < 0) { @@ -704,6 +797,16 @@ main (int argc, char **argv) } for (i = 0; i < num_ev; i++) { + conn = &ssm->conn_pool[ssm->wait_events[i].data.u32]; + if (ssm->wait_events[i].events & (EPOLLHUP | EPOLLRDHUP)) + { +#ifdef VCL_TEST + vppcom_session_close (conn->fd); +#else + close (conn->fd); +#endif + continue; + } if (ssm->wait_events[i].data.u32 == ~0) { new_client (); @@ -717,7 +820,6 @@ main (int argc, char **argv) continue; } #endif - conn = &ssm->conn_pool[ssm->wait_events[i].data.u32]; #endif client_fd = conn->fd; @@ -727,18 +829,19 @@ main (int argc, char **argv) if (EPOLLIN & ssm->wait_events[i].events) #endif { + read_again: rx_bytes = sock_test_read (client_fd, conn->buf, conn->buf_size, &conn->stats); if (rx_bytes > 0) { - rx_cfg = (sock_test_cfg_t *) conn->buf; - if (rx_cfg->magic == SOCK_TEST_CFG_CTRL_MAGIC) + rx_cfg = (vcl_test_cfg_t *) conn->buf; + if (rx_cfg->magic == VCL_TEST_CFG_CTRL_MAGIC) { if (rx_cfg->verbose) { printf ("SERVER (fd %d): Received a cfg message!\n", client_fd); - sock_test_cfg_dump (rx_cfg, 0 /* is_client */ ); + vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ ); } if (rx_bytes != sizeof (*rx_cfg)) @@ -752,7 +855,7 @@ main (int argc, char **argv) { printf ("SERVER (fd %d): Replying to " "cfg message!\n", client_fd); - sock_test_cfg_dump (rx_cfg, 0 /* is_client */ ); + vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ ); } sock_test_write (client_fd, (uint8_t *) & conn->cfg, sizeof (conn->cfg), NULL, @@ -762,17 +865,17 @@ main (int argc, char **argv) switch (rx_cfg->test) { - case SOCK_TEST_TYPE_NONE: - case SOCK_TEST_TYPE_ECHO: + case VCL_TEST_TYPE_NONE: + case VCL_TEST_TYPE_ECHO: sync_config_and_reply (conn, rx_cfg); break; - case SOCK_TEST_TYPE_BI: - case SOCK_TEST_TYPE_UNI: + case VCL_TEST_TYPE_BI: + case VCL_TEST_TYPE_UNI: stream_test_server_start_stop (conn, rx_cfg); break; - case SOCK_TEST_TYPE_EXIT: + case VCL_TEST_TYPE_EXIT: printf ("SERVER: Have a great day, " "connection %d!\n", client_fd); #ifdef VCL_TEST @@ -799,16 +902,18 @@ main (int argc, char **argv) default: fprintf (stderr, "SERVER: ERROR: Unknown test type!\n"); - sock_test_cfg_dump (rx_cfg, 0 /* is_client */ ); + vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ ); break; } continue; } - else if ((conn->cfg.test == SOCK_TEST_TYPE_UNI) || - (conn->cfg.test == SOCK_TEST_TYPE_BI)) + else if ((conn->cfg.test == VCL_TEST_TYPE_UNI) || + (conn->cfg.test == VCL_TEST_TYPE_BI)) { stream_test_server (conn, rx_bytes); + if (ioctl (conn->fd, FIONREAD)) + goto read_again; continue; }