#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-
-#define SOCK_SERVER_USE_EPOLL 1
-#define VPPCOM_SESSION_ATTR_UNIT_TEST 0
-
-#if SOCK_SERVER_USE_EPOLL
#include <sys/epoll.h>
-#if !defined(VCL_TEST)
#include <sys/un.h>
-#endif
-#endif
-
-#ifdef VCL_TEST
-#if VPPCOM_SESSION_ATTR_UNIT_TEST
-#define BUFLEN sizeof (uint64_t) * 16
-uint64_t buffer[16];
-uint32_t buflen = BUFLEN;
-uint32_t *flags = (uint32_t *) buffer;
-#endif
-#endif
+
+#define SOCK_SERVER_MAX_TEST_CONN 10
+#define SOCK_SERVER_MAX_EPOLL_EVENTS 10
typedef struct
{
uint32_t buf_size;
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 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;
struct epoll_event wait_events[SOCK_SERVER_MAX_EPOLL_EVENTS];
-#if !defined (VCL_TEST)
int af_unix_listen_fd;
int af_unix_fd;
struct epoll_event af_unix_listen_ev;
struct sockaddr_un serveraddr;
uint32_t af_unix_xacts;
-#endif
-#endif
size_t num_conn;
size_t conn_pool_size;
sock_server_conn_t *conn_pool;
sock_server_main_t sock_server_main;
-#if ! SOCK_SERVER_USE_EPOLL
-static inline int
-get_nfds (void)
-{
- sock_server_main_t *ssm = &sock_server_main;
- int i, nfds;
-
- for (nfds = i = 0; i < FD_SETSIZE; i++)
- {
- if (FD_ISSET (i, &ssm->rd_fdset) || FD_ISSET (i, &ssm->wr_fdset))
- nfds = i + 1;
- }
- return nfds;
-}
-
-static inline void
-conn_fdset_set (sock_server_conn_t * conn, fd_set * fdset)
-{
- sock_server_main_t *ssm = &sock_server_main;
-
- FD_SET (conn->fd, fdset);
- ssm->nfds = get_nfds ();
-}
-
-static inline void
-conn_fdset_clr (sock_server_conn_t * conn, fd_set * fdset)
-{
- sock_server_main_t *ssm = &sock_server_main;
-
- FD_CLR (conn->fd, fdset);
- ssm->nfds = get_nfds ();
-}
-#endif
-
static inline void
conn_pool_expand (size_t expand_size)
{
int i;
conn_pool = realloc (ssm->conn_pool, new_size * sizeof (*ssm->conn_pool));
- if (conn_pool)
- {
- for (i = ssm->conn_pool_size; i < new_size; i++)
- {
- sock_server_conn_t *conn = &conn_pool[i];
- memset (conn, 0, sizeof (*conn));
- 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;
- }
+ if (!conn_pool)
+ stfail ("conn_pool_expand()");
- ssm->conn_pool = conn_pool;
- ssm->conn_pool_size = new_size;
- }
- else
+ for (i = ssm->conn_pool_size; i < new_size; i++)
{
- int errno_val = errno;
- perror ("ERROR in conn_pool_expand()");
- fprintf (stderr, "SERVER: ERROR: Memory allocation "
- "failed (errno = %d)!\n", errno_val);
+ sock_server_conn_t *conn = &conn_pool[i];
+ memset (conn, 0, sizeof (*conn));
+ 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;
}
+
+ ssm->conn_pool = conn_pool;
+ ssm->conn_pool_size = new_size;
}
static inline sock_server_conn_t *
{
if (!ssm->conn_pool[i].is_alloc)
{
-#ifdef VCL_TEST
- ssm->conn_pool[i].endpt.ip = ssm->conn_pool[i].ip;
-#endif
ssm->conn_pool[i].is_alloc = 1;
return (&ssm->conn_pool[i]);
}
static inline void
conn_pool_free (sock_server_conn_t * conn)
{
-#if ! SOCK_SERVER_USE_EPOLL
- sock_server_main_t *ssm = &sock_server_main;
-
- conn_fdset_clr (conn, &ssm->rd_fdset);
- conn_fdset_clr (conn, &ssm->wr_fdset);
-#endif
conn->fd = 0;
conn->is_alloc = 0;
}
if (conn->cfg.verbose)
{
- printf ("\nSERVER (fd %d): Replying to cfg message!\n", conn->fd);
+ stinf ("(fd %d): Replying to cfg message!\n", conn->fd);
vcl_test_cfg_dump (&conn->cfg, 0 /* is_client */ );
}
(void) sock_test_write (conn->fd, (uint8_t *) & conn->cfg,
vcl_test_cfg_dump (&conn->cfg, 0 /* is_client */ );
if (conn->cfg.verbose)
{
- printf (" sock server main\n"
- VCL_TEST_SEPARATOR_STRING
- " buf: %p\n"
- " buf size: %u (0x%08x)\n"
- VCL_TEST_SEPARATOR_STRING,
- conn->buf, conn->buf_size, conn->buf_size);
+ stinf (" sock server main\n"
+ VCL_TEST_SEPARATOR_STRING
+ " buf: %p\n"
+ " buf size: %u (0x%08x)\n"
+ 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 == VCL_TEST_TYPE_BI ? "Bi" : "Uni");
+ stinf ("SERVER (fd %d): %s-directional Stream Test Complete!\n"
+ SOCK_TEST_BANNER_STRING "\n", conn->fd,
+ 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 == VCL_TEST_TYPE_BI ? "Bi" : "Uni");
+ stinf (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 == VCL_TEST_TYPE_BI ? "Bi" : "Uni");
rx_cfg->ctrl_handle = (rx_cfg->ctrl_handle == ~0) ? conn->fd :
rx_cfg->ctrl_handle;
}
}
-#if SOCK_SERVER_USE_EPOLL && !defined (VCL_TEST)
static inline void
af_unix_echo (void)
{
sock_server_main_t *ssm = &sock_server_main;
- int af_unix_client_fd;
- int rv;
- int errno_val;
+ int af_unix_client_fd, rv;
uint8_t buffer[256];
size_t nbytes = strlen (SOCK_TEST_MIXED_EPOLL_DATA) + 1;
-#if HAVE_ACCEPT4
- af_unix_client_fd = accept4 (ssm->af_unix_listen_fd,
- (struct sockaddr *) NULL, NULL, NULL);
-#else
af_unix_client_fd = accept (ssm->af_unix_listen_fd,
(struct sockaddr *) NULL, NULL);
-#endif
if (af_unix_client_fd < 0)
- {
- errno_val = errno;
- perror ("ERROR in af_unix_accept()");
- fprintf (stderr, "SERVER: ERROR: accept failed "
- "(errno = %d)!\n", errno_val);
- return;
- }
+ stfail ("af_unix_echo accept()");
- printf ("SERVER: Got an AF_UNIX connection -- fd = %d (0x%08x)!\n",
- af_unix_client_fd, af_unix_client_fd);
+ stinf ("Got an AF_UNIX connection -- fd = %d (0x%08x)!",
+ af_unix_client_fd, af_unix_client_fd);
memset (buffer, 0, sizeof (buffer));
rv = read (af_unix_client_fd, buffer, nbytes);
if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in af_unix_echo(): read() failed");
- fprintf (stderr, "SERVER: ERROR: read(af_unix_client_fd %d (0x%x), "
- "nbytes %lu) failed (errno = %d)!\n", af_unix_client_fd,
- af_unix_client_fd, nbytes, errno_val);
- goto done;
- }
+ stfail ("af_unix_echo read()");
+
/* Make the buffer is NULL-terminated. */
buffer[sizeof (buffer) - 1] = 0;
- printf ("SERVER (AF_UNIX): RX (%d bytes) - '%s'\n", rv, buffer);
+ stinf ("(AF_UNIX): RX (%d bytes) - '%s'", rv, buffer);
if (!strncmp (SOCK_TEST_MIXED_EPOLL_DATA, (const char *) buffer, nbytes))
{
rv = write (af_unix_client_fd, buffer, nbytes);
if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in af_unix_echo(): write() failed");
- fprintf (stderr,
- "SERVER: ERROR: write(af_unix_client_fd %d (0x%x), "
- "\"%s\", nbytes %ld) failed (errno = %d)!\n",
- af_unix_client_fd, af_unix_client_fd, buffer, nbytes,
- errno_val);
- goto done;
- }
- printf ("SERVER (AF_UNIX): TX (%d bytes) - '%s'\n", rv, buffer);
+ stfail ("af_unix_echo write()");
+ stinf ("(AF_UNIX): TX (%d bytes) - '%s'\n", rv, buffer);
ssm->af_unix_xacts++;
}
-done:
close (af_unix_client_fd);
}
-#endif
-
static inline void
new_client (void)
{
conn = conn_pool_alloc ();
if (!conn)
- {
- fprintf (stderr, "\nSERVER: ERROR: No free connections!\n");
- return;
- }
+ stfail ("No free connections!");
-#ifdef VCL_TEST
- client_fd = vppcom_session_accept (ssm->listen_fd, &conn->endpt, 0);
- if (client_fd < 0)
- errno = -client_fd;
-#elif HAVE_ACCEPT4
- client_fd = accept4 (ssm->listen_fd, (struct sockaddr *) NULL, NULL, NULL);
-#else
client_fd = accept (ssm->listen_fd, (struct sockaddr *) NULL, NULL);
-#endif
if (client_fd < 0)
- {
- int errno_val;
- errno_val = errno;
- perror ("ERROR in new_client()");
- fprintf (stderr, "SERVER: ERROR: accept failed "
- "(errno = %d)!\n", errno_val);
- return;
- }
+ stfail ("new_client accept()");
- printf ("SERVER: Got a connection -- fd = %d (0x%08x)!\n",
- client_fd, client_fd);
+ stinf ("Got a connection -- fd = %d (0x%08x)!\n", client_fd, client_fd);
+ if (fcntl (client_fd, F_SETFL, O_NONBLOCK) < 0)
+ stfail ("fcntl()");
conn->fd = client_fd;
-#if ! SOCK_SERVER_USE_EPOLL
- conn_fdset_set (conn, &ssm->rd_fdset);
+ struct epoll_event ev;
+ int rv;
+
+ ev.events = EPOLLET | EPOLLIN;
+ ev.data.u64 = conn - ssm->conn_pool;
+ rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, client_fd, &ev);
+
+ if (rv < 0)
+ stfail ("new_client epoll_ctl()");
+
ssm->nfds++;
-#else
- {
- struct epoll_event ev;
- int rv;
-
- ev.events = EPOLLIN;
- ev.data.u64 = conn - ssm->conn_pool;
-#ifdef VCL_TEST
- rv = vppcom_epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, client_fd, &ev);
- if (rv)
- errno = -rv;
-#else
- rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, client_fd, &ev);
-#endif
- if (rv < 0)
- {
- int errno_val;
- errno_val = errno;
- perror ("ERROR in new_client()");
- fprintf (stderr, "SERVER: ERROR: epoll_ctl failed (errno = %d)!\n",
- errno_val);
- }
- else
- ssm->nfds++;
- }
-#endif
+}
+
+static int
+socket_server_echo_af_unix_init (sock_server_main_t * ssm)
+{
+ int rv;
+
+ if (ssm->af_unix_listen_fd > 0)
+ return 0;
+
+ unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME);
+ ssm->af_unix_listen_fd = socket (AF_UNIX, SOCK_STREAM, 0);
+ if (ssm->af_unix_listen_fd < 0)
+ stfail ("echo_af_unix_init socket()");
+
+ memset (&ssm->serveraddr, 0, sizeof (ssm->serveraddr));
+ ssm->serveraddr.sun_family = AF_UNIX;
+ strncpy (ssm->serveraddr.sun_path, SOCK_TEST_AF_UNIX_FILENAME,
+ sizeof (ssm->serveraddr.sun_path));
+
+ rv = bind (ssm->af_unix_listen_fd, (struct sockaddr *) &ssm->serveraddr,
+ SUN_LEN (&ssm->serveraddr));
+ if (rv < 0)
+ stfail ("echo_af_unix_init bind()");
+
+ rv = listen (ssm->af_unix_listen_fd, 10);
+ if (rv < 0)
+ stfail ("echo_af_unix_init listen()");
+
+ ssm->af_unix_listen_ev.events = EPOLLET | EPOLLIN;
+ ssm->af_unix_listen_ev.data.u32 = SOCK_TEST_AF_UNIX_ACCEPT_DATA;
+ rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->af_unix_listen_fd,
+ &ssm->af_unix_listen_ev);
+ if (rv < 0)
+ stfail ("echo_af_unix_init epoll_ctl()");
+
+ return 0;
}
void
exit (1);
}
+
+static void
+sts_server_echo (sock_server_conn_t * conn, int rx_bytes)
+{
+ int tx_bytes, nbytes, pos;
+
+ /* If it looks vaguely like a string make sure it's terminated */
+ pos = rx_bytes < conn->buf_size ? rx_bytes : conn->buf_size - 1;
+ ((char *) conn->buf)[pos] = 0;
+
+ if (conn->cfg.verbose)
+ stinf ("(fd %d): Echoing back\n", conn->fd);
+
+ nbytes = strlen ((const char *) conn->buf) + 1;
+
+ tx_bytes = sock_test_write (conn->fd, conn->buf, nbytes, &conn->stats,
+ conn->cfg.verbose);
+ if (tx_bytes >= 0)
+ stinf ("(fd %d): TX (%d bytes) - '%s'\n", conn->fd, tx_bytes, conn->buf);
+}
+
+static int
+sts_handle_cfg (vcl_test_cfg_t * rx_cfg, sock_server_conn_t * conn,
+ int rx_bytes)
+{
+ sock_server_main_t *ssm = &sock_server_main;
+
+ if (rx_cfg->verbose)
+ {
+ stinf ("(fd %d): Received a cfg message!\n", conn->fd);
+ vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
+ }
+
+ if (rx_bytes != sizeof (*rx_cfg))
+ {
+ stinf ("(fd %d): Invalid cfg message size (%d) expected %lu!", conn->fd,
+ rx_bytes, sizeof (*rx_cfg));
+ conn->cfg.rxbuf_size = 0;
+ conn->cfg.num_writes = 0;
+ if (conn->cfg.verbose)
+ {
+ stinf ("(fd %d): Replying to cfg message!\n", conn->fd);
+ vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
+ }
+ sock_test_write (conn->fd, (uint8_t *) & conn->cfg, sizeof (conn->cfg),
+ NULL, conn->cfg.verbose);
+ return -1;
+ }
+
+ switch (rx_cfg->test)
+ {
+ case VCL_TEST_TYPE_NONE:
+ sync_config_and_reply (conn, rx_cfg);
+ break;
+
+ case VCL_TEST_TYPE_ECHO:
+ if (socket_server_echo_af_unix_init (ssm))
+ goto done;
+
+ sync_config_and_reply (conn, rx_cfg);
+ break;
+
+ case VCL_TEST_TYPE_BI:
+ case VCL_TEST_TYPE_UNI:
+ stream_test_server_start_stop (conn, rx_cfg);
+ break;
+
+ case VCL_TEST_TYPE_EXIT:
+ stinf ("Have a great day connection %d!", conn->fd);
+ close (conn->fd);
+ conn_pool_free (conn);
+ stinf ("Closed client fd %d", conn->fd);
+ ssm->nfds--;
+ break;
+
+ default:
+ stinf ("ERROR: Unknown test type!\n");
+ vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
+ break;
+ }
+
+done:
+ return 0;
+}
+
+static int
+sts_conn_expect_config (sock_server_conn_t * conn)
+{
+ if (conn->cfg.test == VCL_TEST_TYPE_ECHO)
+ return 1;
+
+ return (conn->stats.rx_bytes < 128
+ || conn->stats.rx_bytes > conn->cfg.total_bytes);
+}
+
int
main (int argc, char **argv)
{
+ int client_fd, rv, main_rv = 0, rx_bytes, c, v, i;
sock_server_main_t *ssm = &sock_server_main;
- int client_fd, rv, main_rv = 0;
- int tx_bytes, rx_bytes, nbytes;
sock_server_conn_t *conn;
vcl_test_cfg_t *rx_cfg;
- uint32_t xtra = 0;
- uint64_t xtra_bytes = 0;
struct sockaddr_storage servaddr;
- int errno_val;
- 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
opterr = 0;
while ((c = getopt (argc, argv, "6D")) != -1)
{
default:
if (isprint (optopt))
- fprintf (stderr, "SERVER: ERROR: Unknown "
- "option `-%c'.\n", optopt);
+ stinf ("ERROR: Unknown option `-%c'", optopt);
else
- fprintf (stderr, "SERVER: ERROR: Unknown "
- "option character `\\x%x'.\n", optopt);
+ stinf ("ERROR: Unknown option character `\\x%x'.\n", optopt);
}
/* fall thru */
case 'h':
if (argc < (optind + 1))
{
- fprintf (stderr, "SERVER: ERROR: Insufficient number of arguments!\n");
+ stinf ("ERROR: Insufficient number of arguments!\n");
print_usage_and_exit ();
}
port = (uint16_t) v;
else
{
- fprintf (stderr, "SERVER: ERROR: Invalid port (%s)!\n", argv[optind]);
+ stinf ("ERROR: Invalid port (%s)!\n", argv[optind]);
print_usage_and_exit ();
}
conn_pool_expand (SOCK_SERVER_MAX_TEST_CONN + 1);
-#ifdef VCL_TEST
- rv = vppcom_app_create ("vcl_test_server");
- if (rv)
- {
- errno = -rv;
- ssm->listen_fd = -1;
- }
- else
- {
- ssm->listen_fd = vppcom_session_create (ssm->cfg.transport_udp ?
- VPPCOM_PROTO_UDP :
- VPPCOM_PROTO_TCP,
- 0 /* is_nonblocking */ );
- }
-#else
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);
- if (ssm->af_unix_listen_fd < 0)
- {
- errno_val = errno;
- perror ("ERROR in main(): socket(AF_UNIX) failed");
- fprintf (stderr,
- "SERVER: ERROR: socket(AF_UNIX, SOCK_STREAM, 0) failed "
- "(errno = %d)!\n", errno_val);
- return ssm->af_unix_listen_fd;
- }
-
- memset (&ssm->serveraddr, 0, sizeof (ssm->serveraddr));
- ssm->serveraddr.sun_family = AF_UNIX;
- strncpy (ssm->serveraddr.sun_path, SOCK_TEST_AF_UNIX_FILENAME,
- sizeof (ssm->serveraddr.sun_path));
- rv = bind (ssm->af_unix_listen_fd, (struct sockaddr *) &ssm->serveraddr,
- SUN_LEN (&ssm->serveraddr));
- if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main(): bind(SOCK_TEST_AF_UNIX_FILENAME) failed");
- fprintf (stderr, "SERVER: ERROR: bind() fd %d, \"%s\": "
- "failed (errno = %d)!\n", ssm->af_unix_listen_fd,
- SOCK_TEST_AF_UNIX_FILENAME, errno_val);
- close (ssm->af_unix_listen_fd);
- unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME);
- return rv;
- }
-
- rv = listen (ssm->af_unix_listen_fd, 10);
- if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main(): listen(AF_UNIX) failed");
- fprintf (stderr, "SERVER: ERROR: listen() fd %d, \"%s\": "
- "failed (errno = %d)!\n", ssm->af_unix_listen_fd,
- SOCK_TEST_AF_UNIX_FILENAME, errno_val);
- close (ssm->af_unix_listen_fd);
- unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME);
- return rv;
- }
-#endif /* SOCK_SERVER_USE_EPOLL */
-#endif
if (ssm->listen_fd < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: socket() failed "
- "(errno = %d)!\n", errno_val);
- return ssm->listen_fd;
- }
+ stfail ("main listen()");
memset (&servaddr, 0, sizeof (servaddr));
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
- 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)
- {
- errno = -rv;
- rv = -1;
- }
-#else
rv = bind (ssm->listen_fd, (struct sockaddr *) &servaddr, servaddr_size);
-#endif
if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: bind failed (errno = %d)!\n",
- errno_val);
- return rv;
- }
- if (fcntl (ssm->listen_fd, F_SETFL, O_NONBLOCK) < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: fcntl failed (errno = %d)!\n",
- errno_val);
- return rv;
- }
+ stfail ("main bind()");
-#ifdef VCL_TEST
- rv = vppcom_session_listen (ssm->listen_fd, 10);
- if (rv)
- {
- errno = -rv;
- rv = -1;
- }
-#else
- rv = listen (ssm->listen_fd, 10);
-#endif
+ rv = fcntl (ssm->listen_fd, F_SETFL, O_NONBLOCK);
if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: listen failed "
- "(errno = %d)!\n", errno_val);
- return rv;
- }
-
-#if ! SOCK_SERVER_USE_EPOLL
+ stfail ("main fcntl()");
- FD_ZERO (&ssm->wr_fdset);
- FD_ZERO (&ssm->rd_fdset);
-
- FD_SET (ssm->listen_fd, &ssm->rd_fdset);
- ssm->nfds = ssm->listen_fd + 1;
+ rv = listen (ssm->listen_fd, 10);
+ if (rv < 0)
+ stfail ("main listen()");
-#else
-#ifdef VCL_TEST
- ssm->epfd = vppcom_epoll_create ();
- if (ssm->epfd < 0)
- errno = -ssm->epfd;
-#else
ssm->epfd = epoll_create (1);
-#endif
if (ssm->epfd < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: epoll_create failed (errno = %d)!\n",
- errno_val);
- return ssm->epfd;
- }
+ stfail ("main epoll_create()");
- ssm->listen_ev.events = EPOLLIN;
+ ssm->listen_ev.events = EPOLLET | EPOLLIN;
ssm->listen_ev.data.u32 = ~0;
-#ifdef VCL_TEST
- rv = vppcom_epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->listen_fd,
- &ssm->listen_ev);
- if (rv < 0)
- errno = -rv;
-#else
- ssm->af_unix_listen_ev.events = EPOLLIN;
- ssm->af_unix_listen_ev.data.u32 = SOCK_TEST_AF_UNIX_ACCEPT_DATA;
- rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->af_unix_listen_fd,
- &ssm->af_unix_listen_ev);
- if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main(): mixed epoll_ctl(EPOLL_CTL_ADD)");
- fprintf (stderr, "SERVER: ERROR: mixed epoll_ctl(epfd %d (0x%x), "
- "EPOLL_CTL_ADD, af_unix_listen_fd %d (0x%x), EPOLLIN) failed "
- "(errno = %d)!\n", ssm->epfd, ssm->epfd,
- ssm->af_unix_listen_fd, ssm->af_unix_listen_fd, errno_val);
- close (ssm->af_unix_listen_fd);
- unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME);
- return rv;
- }
rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->listen_fd, &ssm->listen_ev);
-#endif
if (rv < 0)
- {
- errno_val = errno;
- perror ("ERROR in main()");
- fprintf (stderr, "SERVER: ERROR: epoll_ctl failed "
- "(errno = %d)!\n", errno_val);
- return rv;
- }
-#endif
+ stfail ("main epoll_ctl()");
- printf ("\nSERVER: Waiting for a client to connect on port %d...\n", port);
+ stinf ("Waiting for a client to connect on port %d...\n", port);
while (1)
{
-#if ! SOCK_SERVER_USE_EPOLL
- _rfdset = ssm->rd_fdset;
-
-#ifdef VCL_TEST
- rv = vppcom_select (ssm->nfds, (unsigned long *) rfdset, NULL, NULL, 0);
-#else
- {
- struct timeval timeout;
- timeout = ssm->timeout;
- _wfdset = ssm->wr_fdset;
- rv = select (ssm->nfds, rfdset, wfdset, NULL, &timeout);
- }
-#endif
- if (rv < 0)
- {
- perror ("select()");
- fprintf (stderr, "\nSERVER: ERROR: select() failed -- aborting!\n");
- main_rv = -1;
- goto done;
- }
- else if (rv == 0)
- continue;
-
- if (FD_ISSET (ssm->listen_fd, rfdset))
- new_client ();
-
- for (i = 0; i < ssm->conn_pool_size; i++)
- {
- if (!ssm->conn_pool[i].is_alloc)
- continue;
-
- conn = &ssm->conn_pool[i];
-#else
int num_ev;
-#ifdef VCL_TEST
- num_ev = vppcom_epoll_wait (ssm->epfd, ssm->wait_events,
- SOCK_SERVER_MAX_EPOLL_EVENTS, 60.0);
- if (num_ev < 0)
- errno = -num_ev;
-#else
num_ev = epoll_wait (ssm->epfd, ssm->wait_events,
SOCK_SERVER_MAX_EPOLL_EVENTS, 60000);
-#endif
if (num_ev < 0)
- {
- perror ("epoll_wait()");
- fprintf (stderr, "\nSERVER: ERROR: epoll_wait() "
- "failed -- aborting!\n");
- main_rv = -1;
- goto done;
- }
+ stfail ("main epoll_wait()");
+
if (num_ev == 0)
{
- fprintf (stderr, "\nSERVER: epoll_wait() timeout!\n");
+ stinf ("epoll_wait() timeout!\n");
continue;
}
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 ();
continue;
}
-#if !defined (VCL_TEST)
else if (ssm->wait_events[i].data.u32 ==
SOCK_TEST_AF_UNIX_ACCEPT_DATA)
{
af_unix_echo ();
continue;
}
-#endif
-#endif
client_fd = conn->fd;
-#if ! SOCK_SERVER_USE_EPOLL
- if (FD_ISSET (client_fd, rfdset))
-#else
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)
+
+ if (rx_bytes <= 0)
+ {
+ if (errno == ECONNRESET)
+ {
+ stinf ("Connection reset by peer\n");
+ main_rv = -1;
+ goto done;
+ }
+ else
+ continue;
+ }
+
+ if (sts_conn_expect_config (conn))
{
rx_cfg = (vcl_test_cfg_t *) conn->buf;
if (rx_cfg->magic == VCL_TEST_CFG_CTRL_MAGIC)
{
- if (rx_cfg->verbose)
+ sts_handle_cfg (rx_cfg, conn, rx_bytes);
+ if (!ssm->nfds)
{
- printf ("SERVER (fd %d): Received a cfg message!\n",
- client_fd);
- vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
- }
-
- if (rx_bytes != sizeof (*rx_cfg))
- {
- printf ("SERVER (fd %d): Invalid cfg message "
- "size (%d)!\n Should be %lu bytes.\n",
- client_fd, rx_bytes, sizeof (*rx_cfg));
- conn->cfg.rxbuf_size = 0;
- conn->cfg.num_writes = 0;
- if (conn->cfg.verbose)
- {
- printf ("SERVER (fd %d): Replying to "
- "cfg message!\n", client_fd);
- vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
- }
- sock_test_write (client_fd, (uint8_t *) & conn->cfg,
- sizeof (conn->cfg), NULL,
- conn->cfg.verbose);
- continue;
- }
-
- switch (rx_cfg->test)
- {
- case VCL_TEST_TYPE_NONE:
- case VCL_TEST_TYPE_ECHO:
- sync_config_and_reply (conn, rx_cfg);
- break;
-
- case VCL_TEST_TYPE_BI:
- case VCL_TEST_TYPE_UNI:
- stream_test_server_start_stop (conn, rx_cfg);
- break;
-
- case VCL_TEST_TYPE_EXIT:
- printf ("SERVER: Have a great day, "
- "connection %d!\n", client_fd);
-#ifdef VCL_TEST
- vppcom_session_close (client_fd);
-#else
- close (client_fd);
-#endif
- conn_pool_free (conn);
- printf ("SERVER: Closed client fd %d\n", client_fd);
-#if ! SOCK_SERVER_USE_EPOLL
- if (ssm->nfds == (ssm->listen_fd + 1))
-#else
- ssm->nfds--;
- if (!ssm->nfds)
-#endif
- {
- printf ("SERVER: All client connections "
- "closed.\n\nSERVER: "
- "May the force be with you!\n\n");
- goto done;
- }
- break;
-
- default:
- fprintf (stderr,
- "SERVER: ERROR: Unknown test type!\n");
- vcl_test_cfg_dump (rx_cfg, 0 /* is_client */ );
- break;
+ stinf ("All client connections closed.\n\nSERVER: "
+ "May the force be with you!\n\n");
+ goto done;
}
continue;
}
-
- 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;
- }
-
- else if (isascii (conn->buf[0]))
- {
- // If it looks vaguely like a string, make sure it's terminated
- ((char *) conn->buf)[rx_bytes <
- conn->buf_size ? rx_bytes :
- conn->buf_size - 1] = 0;
- printf ("SERVER (fd %d): RX (%d bytes) - '%s'\n",
- conn->fd, rx_bytes, conn->buf);
- }
}
- else // rx_bytes < 0
+
+ if ((conn->cfg.test == VCL_TEST_TYPE_UNI)
+ || (conn->cfg.test == VCL_TEST_TYPE_BI))
{
- if (errno == ECONNRESET)
- {
- printf ("\nSERVER: Connection reset by remote peer.\n"
- " Y'all have a great day now!\n\n");
- break;
- }
- else
- continue;
+ stream_test_server (conn, rx_bytes);
+ if (ioctl (conn->fd, FIONREAD))
+ goto read_again;
+ continue;
}
-
- if (isascii (conn->buf[0]))
+ else if (isascii (conn->buf[0]))
{
- /* If it looks vaguely like a string,
- * make sure it's terminated
- */
- ((char *) conn->buf)[rx_bytes <
- conn->buf_size ? rx_bytes :
- conn->buf_size - 1] = 0;
- if (xtra)
- fprintf (stderr, "SERVER: ERROR: "
- "FIFO not drained in previous test!\n"
- " extra chunks %u (0x%x)\n"
- " extra bytes %lu (0x%lx)\n",
- xtra, xtra, xtra_bytes, xtra_bytes);
-
- xtra = 0;
- xtra_bytes = 0;
-
- if (conn->cfg.verbose)
- printf ("SERVER (fd %d): Echoing back\n", client_fd);
-
- nbytes = strlen ((const char *) conn->buf) + 1;
-
- tx_bytes = sock_test_write (client_fd, conn->buf,
- nbytes, &conn->stats,
- conn->cfg.verbose);
- if (tx_bytes >= 0)
- printf ("SERVER (fd %d): TX (%d bytes) - '%s'\n",
- conn->fd, tx_bytes, conn->buf);
+ sts_server_echo (conn, rx_bytes);
}
-
- else // Extraneous read data from non-echo tests???
+ else
{
- xtra++;
- xtra_bytes += rx_bytes;
+ stwrn ("FIFO not drained! extra bytes %d", rx_bytes);
}
}
}
}
done:
-#ifdef VCL_TEST
- vppcom_session_close (ssm->listen_fd);
- vppcom_app_destroy ();
-#else
close (ssm->listen_fd);
-
-#if SOCK_SERVER_USE_EPOLL && !defined (VCL_TEST)
close (ssm->af_unix_listen_fd);
unlink ((const char *) SOCK_TEST_AF_UNIX_FILENAME);
-#endif /* SOCK_SERVER_USE_EPOLL */
-#endif
if (ssm->conn_pool)
free (ssm->conn_pool);
Code Review / vpp.git / blobdiff