aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--[-rwxr-xr-x]src/tests/vnet/session/tcp_echo.c (renamed from src/uri/uri_tcp_test.c)0
-rw-r--r--src/tests/vnet/session/udp_echo.c (renamed from src/uri/uri_udp_test.c)0
-rw-r--r--src/uri.am33
-rw-r--r--src/uri/uri_socket_server.c231
-rw-r--r--src/uri/uri_socket_test.c181
-rw-r--r--src/vnet.am15
7 files changed, 15 insertions, 446 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 04b6c5c5d6e..7e6fda576b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,7 +68,6 @@ include vlib-api.am
include vnet.am
include vpp.am
include vpp-api-test.am
-include uri.am
include vcl.am
SUBDIRS += plugins
diff --git a/src/uri/uri_tcp_test.c b/src/tests/vnet/session/tcp_echo.c
index 8bdcac3a88c..8bdcac3a88c 100755..100644
--- a/src/uri/uri_tcp_test.c
+++ b/src/tests/vnet/session/tcp_echo.c
diff --git a/src/uri/uri_udp_test.c b/src/tests/vnet/session/udp_echo.c
index ac9411835ec..ac9411835ec 100644
--- a/src/uri/uri_udp_test.c
+++ b/src/tests/vnet/session/udp_echo.c
diff --git a/src/uri.am b/src/uri.am
deleted file mode 100644
index 11dae54a5af..00000000000
--- a/src/uri.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-noinst_PROGRAMS += \
- uri_udp_test \
- uri_tcp_test \
- uri_socket_test \
- uri_socket_server
-
-uri_udp_test_SOURCES = uri/uri_udp_test.c
-uri_udp_test_LDADD = libvlibmemoryclient.la libsvm.la \
- libvppinfra.la -lpthread -lm -lrt
-
-uri_tcp_test_SOURCES = uri/uri_tcp_test.c
-uri_tcp_test_LDADD = libvlibmemoryclient.la libsvm.la \
- libvppinfra.la -lpthread -lm -lrt
-
-uri_socket_test_SOURCES = uri/uri_socket_test.c
-uri_socket_test_LDADD = libvppinfra.la -lpthread -lm -lrt
-
-uri_socket_server_SOURCES = uri/uri_socket_server.c
-uri_socket_server_LDADD = libvppinfra.la -lpthread -lm -lrt
-
diff --git a/src/uri/uri_socket_server.c b/src/uri/uri_socket_server.c
deleted file mode 100644
index 4f4c5f30803..00000000000
--- a/src/uri/uri_socket_server.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <vppinfra/format.h>
-#include <signal.h>
-#include <sys/ucontext.h>
-#include <sys/time.h>
-
-volatile int signal_received;
-
-static void
-unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
-{
- signal_received = 1;
-}
-
-static void
-setup_signal_handler (void)
-{
- uword i;
- struct sigaction sa;
-
- for (i = 1; i < 32; i++)
- {
- memset (&sa, 0, sizeof (sa));
- sa.sa_sigaction = (void *) unix_signal_handler;
- sa.sa_flags = SA_SIGINFO;
-
- switch (i)
- {
- /* these signals take the default action */
- case SIGABRT:
- case SIGKILL:
- case SIGSTOP:
- case SIGUSR1:
- case SIGUSR2:
- continue;
-
- /* ignore SIGPIPE, SIGCHLD */
- case SIGPIPE:
- case SIGCHLD:
- sa.sa_sigaction = (void *) SIG_IGN;
- break;
-
- /* catch and handle all other signals */
- default:
- break;
- }
-
- if (sigaction (i, &sa, 0) < 0)
- clib_unix_warning ("sigaction %U", format_signal, i);
- }
-}
-
-
-int
-main (int argc, char *argv[])
-{
- int sockfd, portno, n, sent, accfd, reuse;
- socklen_t client_addr_len;
- struct sockaddr_in serv_addr;
- struct sockaddr_in client;
- struct hostent *server;
- u8 *rx_buffer = 0, no_echo = 0;
- struct timeval start, end;
- long rcvd = 0;
- double deltat;
-
- if (argc > 1 && argc < 3)
- {
- fformat (stderr, "usage %s host port\n", argv[0]);
- exit (0);
- }
-
- if (argc >= 4)
- {
- no_echo = atoi (argv[3]);
- portno = atoi (argv[2]);
- server = gethostbyname (argv[1]);
- if (server == NULL)
- {
- clib_unix_warning ("gethostbyname");
- exit (1);
- }
- }
- else
- {
- /* Defaults */
- portno = 1234;
- server = gethostbyname ("6.0.1.1");
- if (server == NULL)
- {
- clib_unix_warning ("gethostbyname");
- exit (1);
- }
- }
-
-
- setup_signal_handler ();
-
- sockfd = socket (AF_INET, SOCK_STREAM, 0);
- if (sockfd < 0)
- {
- clib_unix_error ("socket");
- exit (1);
- }
-
- reuse = 1;
- if (setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, (const char *) &reuse,
- sizeof (reuse)) < 0)
- {
- clib_unix_error ("setsockopt(SO_REUSEADDR) failed");
- exit (1);
- }
-
- bzero ((char *) &serv_addr, sizeof (serv_addr));
- serv_addr.sin_family = AF_INET;
- bcopy ((char *) server->h_addr,
- (char *) &serv_addr.sin_addr.s_addr, server->h_length);
- serv_addr.sin_port = htons (portno);
- if (bind (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
- {
- clib_unix_warning ("bind");
- exit (1);
- }
-
- vec_validate (rx_buffer, 128 << 10);
-
- if (listen (sockfd, 5 /* backlog */ ) < 0)
- {
- clib_unix_warning ("listen");
- close (sockfd);
- return 1;
- }
-
- while (1)
- {
- if (signal_received)
- break;
-
- client_addr_len = sizeof (struct sockaddr);
- accfd = accept (sockfd, (struct sockaddr *) &client, &client_addr_len);
- if (accfd < 0)
- {
- clib_unix_warning ("accept");
- continue;
- }
- fformat (stderr, "Accepted connection from: %s : %d\n",
- inet_ntoa (client.sin_addr), client.sin_port);
- gettimeofday (&start, NULL);
-
- while (1)
- {
- n = recv (accfd, rx_buffer, vec_len (rx_buffer), 0 /* flags */ );
- if (n == 0)
- {
- /* Graceful exit */
- close (accfd);
- gettimeofday (&end, NULL);
- deltat = (end.tv_sec - start.tv_sec);
- deltat += (end.tv_usec - start.tv_usec) / 1000000.0;
- clib_warning ("Finished in %.6f", deltat);
- clib_warning ("%.4f Gbit/second %s",
- (((f64) rcvd * 8.0) / deltat / 1e9),
- no_echo ? "half" : "full");
- rcvd = 0;
- break;
- }
- if (n < 0)
- {
- clib_unix_warning ("recv");
- close (accfd);
- break;
- }
-
- if (signal_received)
- break;
-
- rcvd += n;
- if (no_echo)
- continue;
-
- sent = send (accfd, rx_buffer, n, 0 /* flags */ );
- if (n < 0)
- {
- clib_unix_warning ("send");
- close (accfd);
- break;
- }
-
- if (sent != n)
- {
- clib_warning ("sent %d not %d", sent, n);
- }
-
- if (signal_received)
- break;
- }
- }
-
- close (sockfd);
-
- return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/uri/uri_socket_test.c b/src/uri/uri_socket_test.c
deleted file mode 100644
index 4469b03d4c2..00000000000
--- a/src/uri/uri_socket_test.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <vppinfra/format.h>
-#include <sys/time.h>
-
-int
-main (int argc, char *argv[])
-{
- int sockfd, portno, n;
- struct sockaddr_in serv_addr;
- struct hostent *server;
- u8 *rx_buffer = 0, *tx_buffer = 0, no_echo = 0, test_bytes = 0;
- u32 offset;
- long bytes = 1 << 20, to_send;
- int i;
- struct timeval start, end;
- double deltat;
-
- if (argc >= 3)
- {
- portno = atoi (argv[2]);
- server = gethostbyname (argv[1]);
- if (server == NULL)
- {
- clib_unix_warning ("gethostbyname");
- exit (1);
- }
-
- argc -= 3;
- argv += 3;
-
- if (argc)
- {
- bytes = ((long) atoi (argv[0])) << 20;
- argc--;
- argv++;
- }
- if (argc)
- {
- no_echo = atoi (argv[0]);
- argc--;
- argv++;
- }
- if (argc)
- {
- test_bytes = atoi (argv[0]);
- argc--;
- argv++;
- }
- }
- else
- {
- portno = 1234; // atoi(argv[2]);
- server = gethostbyname ("6.0.1.1" /* argv[1] */ );
- if (server == NULL)
- {
- clib_unix_warning ("gethostbyname");
- exit (1);
- }
- }
-
- to_send = bytes;
- sockfd = socket (AF_INET, SOCK_STREAM, 0);
- if (sockfd < 0)
- {
- clib_unix_error ("socket");
- exit (1);
- }
-
- bzero ((char *) &serv_addr, sizeof (serv_addr));
- serv_addr.sin_family = AF_INET;
- bcopy ((char *) server->h_addr,
- (char *) &serv_addr.sin_addr.s_addr, server->h_length);
- serv_addr.sin_port = htons (portno);
- if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
- {
- clib_unix_warning ("connect");
- exit (1);
- }
-
- vec_validate (rx_buffer, 128 << 10);
- vec_validate (tx_buffer, 128 << 10);
-
- for (i = 0; i < vec_len (tx_buffer); i++)
- tx_buffer[i] = (i + 1) % 0xff;
-
- /*
- * Send one packet to warm up the RX pipeline
- */
- n = send (sockfd, tx_buffer, vec_len (tx_buffer), 0 /* flags */ );
- if (n != vec_len (tx_buffer))
- {
- clib_unix_warning ("write");
- exit (0);
- }
-
- gettimeofday (&start, NULL);
- while (bytes > 0)
- {
- /*
- * TX
- */
- n = send (sockfd, tx_buffer, vec_len (tx_buffer), 0 /* flags */ );
- if (n != vec_len (tx_buffer))
- {
- clib_unix_warning ("write");
- exit (0);
- }
- bytes -= n;
-
- if (no_echo)
- continue;
-
- /*
- * RX
- */
-
- offset = 0;
- do
- {
- n = recv (sockfd, rx_buffer + offset,
- vec_len (rx_buffer) - offset, 0 /* flags */ );
- if (n < 0)
- {
- clib_unix_warning ("read");
- exit (0);
- }
- offset += n;
- }
- while (offset < vec_len (rx_buffer));
-
- if (test_bytes)
- {
- for (i = 0; i < vec_len (rx_buffer); i++)
- {
- if (rx_buffer[i] != tx_buffer[i])
- {
- clib_warning ("[%d] read 0x%x not 0x%x", rx_buffer[i],
- tx_buffer[i]);
- exit (1);
- }
- }
- }
- }
- close (sockfd);
- gettimeofday (&end, NULL);
-
- deltat = (end.tv_sec - start.tv_sec);
- deltat += (end.tv_usec - start.tv_usec) / 1000000.0; // us to ms
- clib_warning ("Finished in %.6f", deltat);
- clib_warning ("%.4f Gbit/second %s", (((f64) to_send * 8.0) / deltat / 1e9),
- no_echo ? "half" : "full");
- return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet.am b/src/vnet.am
index ae125bc57ef..35a072f6d8a 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -1188,6 +1188,21 @@ nobase_include_HEADERS += \
API_FILES += vnet/bier/bier.api
########################################
+# Test apps
+########################################
+
+noinst_PROGRAMS += tcp_echo udp_echo
+
+TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la
+TEST_APPS_LDADD += -lpthread -lm -lrt
+
+tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c
+tcp_echo_LDADD = $(TEST_APPS_LDADD)
+
+udp_echo_SOURCES = tests/vnet/session/udp_echo.c
+udp_echo_LDADD = $(TEST_APPS_LDADD)
+
+########################################
# Plugin client library
########################################