[SCM] Socket Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Dec 20 09:16:01 MST 2013
The branch, master has been updated
via 7d0e5ef tests: Use torture_server_(address|port).
via f6f5e28 torture: Add torture_server_port().
via 379af07 torture: Add torture_server_address().
via 33404b4 torture: Let the echo server listen on anyaddr.
from 38823ac swrap: Fix loading of system libraries.
http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7d0e5efedce4cc338d0f9fb355793eba6542dfa9
Author: Andreas Schneider <asn at samba.org>
Date: Fri Dec 20 17:09:56 2013 +0100
tests: Use torture_server_(address|port).
This makes it possible to run tests without socket_wrapper.
commit f6f5e28f3382d3828228089765040413682db85a
Author: Andreas Schneider <asn at samba.org>
Date: Fri Dec 20 16:53:32 2013 +0100
torture: Add torture_server_port().
commit 379af0763be3c25d8b4ec75220d0f98007f9328b
Author: Andreas Schneider <asn at samba.org>
Date: Fri Dec 20 16:37:59 2013 +0100
torture: Add torture_server_address().
This should make it easier to run the test without socket_wrapper.
commit 33404b45bcbca1691d3d9fb8bb5b4f2c15caef0e
Author: Andreas Schneider <asn at samba.org>
Date: Fri Dec 20 16:31:00 2013 +0100
torture: Let the echo server listen on anyaddr.
-----------------------------------------------------------------------
Summary of changes:
tests/README | 9 ++++
tests/test_echo_tcp_write_read.c | 12 ++++--
tests/test_echo_udp_send_recv.c | 12 ++++--
tests/test_echo_udp_sendto_recvfrom.c | 16 +++++---
tests/torture.c | 73 +++++++++++++++++++++++++++++----
tests/torture.h | 8 +--
6 files changed, 103 insertions(+), 27 deletions(-)
create mode 100644 tests/README
Changeset truncated at 500 lines:
diff --git a/tests/README b/tests/README
new file mode 100644
index 0000000..26bf1fb
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,9 @@
+In this directory you can find all socket_wrapper tests. All tests can also be
+executed outside of the 'make test' environment and without socket_wrapper.
+
+This can be done with:
+
+TORTURE_SERVER_ADDRESS_IPV4="127.0.0.1" \
+TORTURE_SERVER_ADDRESS_IPV6="::1" \
+TORTURE_SERVER_PORT=7777 \
+./tests/test_echo_tcp_write_read
diff --git a/tests/test_echo_tcp_write_read.c b/tests/test_echo_tcp_write_read.c
index 389e400..e2ffe91 100644
--- a/tests/test_echo_tcp_write_read.c
+++ b/tests/test_echo_tcp_write_read.c
@@ -46,9 +46,11 @@ static void test_write_read_ipv4(void **state)
ZERO_STRUCT(sin);
sin.sin_family = AF_INET;
- sin.sin_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin.sin_port = htons(torture_server_port());
- rc = inet_pton(sin.sin_family, TORTURE_ECHO_SRV_IPV4, &sin.sin_addr);
+ rc = inet_pton(sin.sin_family,
+ torture_server_address(AF_INET),
+ &sin.sin_addr);
assert_int_equal(rc, 1);
rc = connect(s, (struct sockaddr *)&sin, slen);
@@ -93,9 +95,11 @@ static void test_write_read_ipv6(void **state)
ZERO_STRUCT(sin6);
sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin6.sin6_port = htons(torture_server_port());
- rc = inet_pton(AF_INET6, TORTURE_ECHO_SRV_IPV6, &sin6.sin6_addr);
+ rc = inet_pton(AF_INET6,
+ torture_server_address(AF_INET6),
+ &sin6.sin6_addr);
assert_int_equal(rc, 1);
rc = connect(s, (struct sockaddr *)&sin6, slen);
diff --git a/tests/test_echo_udp_send_recv.c b/tests/test_echo_udp_send_recv.c
index c197251..4ea6812 100644
--- a/tests/test_echo_udp_send_recv.c
+++ b/tests/test_echo_udp_send_recv.c
@@ -46,9 +46,11 @@ static void test_send_recv_ipv4(void **state)
ZERO_STRUCT(sin);
sin.sin_family = AF_INET;
- sin.sin_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin.sin_port = htons(torture_server_port());
- rc = inet_pton(sin.sin_family, TORTURE_ECHO_SRV_IPV4, &sin.sin_addr);
+ rc = inet_pton(AF_INET,
+ torture_server_address(AF_INET),
+ &sin.sin_addr);
assert_int_equal(rc, 1);
rc = connect(s, (struct sockaddr *)&sin, slen);
@@ -95,9 +97,11 @@ static void test_send_recv_ipv6(void **state)
ZERO_STRUCT(sin6);
sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin6.sin6_port = htons(torture_server_port());
- rc = inet_pton(AF_INET6, TORTURE_ECHO_SRV_IPV6, &sin6.sin6_addr);
+ rc = inet_pton(AF_INET6,
+ torture_server_address(AF_INET6),
+ &sin6.sin6_addr);
assert_int_equal(rc, 1);
rc = connect(s, (struct sockaddr *)&sin6, slen);
diff --git a/tests/test_echo_udp_sendto_recvfrom.c b/tests/test_echo_udp_sendto_recvfrom.c
index f68cef9..a7ed474 100644
--- a/tests/test_echo_udp_sendto_recvfrom.c
+++ b/tests/test_echo_udp_sendto_recvfrom.c
@@ -48,9 +48,11 @@ static void test_sendto_recvfrom_ipv4(void **state)
ZERO_STRUCT(sin);
sin.sin_family = AF_INET;
- sin.sin_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin.sin_port = htons(torture_server_port());
- rc = inet_pton(sin.sin_family, TORTURE_ECHO_SRV_IPV4, &sin.sin_addr);
+ rc = inet_pton(AF_INET,
+ torture_server_address(AF_INET),
+ &sin.sin_addr);
assert_int_equal(rc, 1);
for (i = 0; i < 10; i++) {
@@ -79,7 +81,7 @@ static void test_sendto_recvfrom_ipv4(void **state)
a = inet_ntop(AF_INET, &srv_in.sin_addr, ip, sizeof(ip));
assert_non_null(a);
- assert_string_equal(a, TORTURE_ECHO_SRV_IPV4);
+ assert_string_equal(a, torture_server_address(AF_INET));
assert_memory_equal(send_buf, recv_buf, sizeof(send_buf));
}
@@ -122,9 +124,11 @@ static void test_sendto_recvfrom_ipv6(void **state)
ZERO_STRUCT(sin6);
sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(TORTURE_ECHO_SRV_PORT);
+ sin6.sin6_port = htons(torture_server_port());
- rc = inet_pton(AF_INET6, TORTURE_ECHO_SRV_IPV6, &sin6.sin6_addr);
+ rc = inet_pton(AF_INET6,
+ torture_server_address(AF_INET6),
+ &sin6.sin6_addr);
assert_int_equal(rc, 1);
for (i = 0; i < 10; i++) {
@@ -153,7 +157,7 @@ static void test_sendto_recvfrom_ipv6(void **state)
a = inet_ntop(AF_INET6, &srv_in6.sin6_addr, ip, sizeof(ip));
assert_non_null(a);
- assert_string_equal(a, TORTURE_ECHO_SRV_IPV6);
+ assert_string_equal(a, torture_server_address(AF_INET6));
assert_memory_equal(send_buf, recv_buf, sizeof(send_buf));
}
diff --git a/tests/torture.c b/tests/torture.c
index 75a4280..a441ec3 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -49,9 +49,57 @@
#include <unistd.h>
#include <time.h>
+#define TORTURE_ECHO_SRV_IPV4 "127.0.0.10"
+/* socket wrapper IPv6 prefix fd00::5357:5fxx */
+#define TORTURE_ECHO_SRV_IPV6 "fd00::5357:5f0a"
+#define TORTURE_ECHO_SRV_PORT 7
+
#define TORTURE_SOCKET_DIR "/tmp/test_socket_wrapper_XXXXXX"
#define TORTURE_ECHO_SRV_PIDFILE "echo_srv.pid"
+const char *torture_server_address(int family)
+{
+ switch (family) {
+ case AF_INET: {
+ const char *ip4 = getenv("TORTURE_SERVER_ADDRESS_IPV4");
+
+ if (ip4 != NULL && ip4[0] != '\0') {
+ return ip4;
+ }
+
+ return TORTURE_ECHO_SRV_IPV4;
+ }
+ case AF_INET6: {
+ const char *ip6 = getenv("TORTURE_SERVER_ADDRESS_IPV6");
+
+ if (ip6 != NULL && ip6[0] != '\0') {
+ return ip6;
+ }
+
+ return TORTURE_ECHO_SRV_IPV6;
+ }
+ default:
+ return NULL;
+ }
+
+ return NULL;
+}
+
+int torture_server_port(void)
+{
+ char *env = getenv("TORTURE_SERVER_PORT");
+
+ if (env != NULL && env[0] != '\0' && strlen(env) < 6) {
+ int port = atoi(env);
+
+ if (port > 0 && port < 65536) {
+ return port;
+ }
+ }
+
+ return TORTURE_ECHO_SRV_PORT;
+}
+
void torture_setup_socket_dir(void **state)
{
struct torture_state *s;
@@ -82,6 +130,7 @@ void torture_setup_socket_dir(void **state)
static void torture_setup_echo_srv_ip(void **state,
const char *ip,
+ int port,
int type)
{
struct torture_state *s;
@@ -109,8 +158,8 @@ static void torture_setup_echo_srv_ip(void **state,
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "10", 1);
snprintf(start_echo_srv, sizeof(start_echo_srv),
- "%s/tests/echo_srv -b %s -D %s --pid %s",
- BINARYDIR, ip, t, s->srv_pidfile);
+ "%s/tests/echo_srv -b %s -p %d -D %s --pid %s",
+ BINARYDIR, ip, port, t, s->srv_pidfile);
rc = system(start_echo_srv);
assert_int_equal(rc, 0);
@@ -123,26 +172,34 @@ static void torture_setup_echo_srv_ip(void **state,
void torture_setup_echo_srv_udp_ipv4(void **state)
{
- torture_setup_echo_srv_ip(state, TORTURE_ECHO_SRV_IPV4, SOCK_DGRAM);
+ torture_setup_echo_srv_ip(state,
+ "0.0.0.0",
+ torture_server_port(),
+ SOCK_DGRAM);
}
void torture_setup_echo_srv_udp_ipv6(void **state)
{
- torture_setup_echo_srv_ip(state, TORTURE_ECHO_SRV_IPV6, SOCK_DGRAM);
+ torture_setup_echo_srv_ip(state,
+ "::",
+ torture_server_port(),
+ SOCK_DGRAM);
}
void torture_setup_echo_srv_tcp_ipv4(void **state)
{
torture_setup_echo_srv_ip(state,
- TORTURE_ECHO_SRV_IPV4,
- SOCK_STREAM);
+ "0.0.0.0",
+ torture_server_port(),
+ SOCK_STREAM);
}
void torture_setup_echo_srv_tcp_ipv6(void **state)
{
torture_setup_echo_srv_ip(state,
- TORTURE_ECHO_SRV_IPV6,
- SOCK_STREAM);
+ "::",
+ torture_server_port(),
+ SOCK_STREAM);
}
void torture_teardown_socket_dir(void **state)
diff --git a/tests/torture.h b/tests/torture.h
index 3d0b517..241b4a7 100644
--- a/tests/torture.h
+++ b/tests/torture.h
@@ -44,11 +44,6 @@
#include <stdint.h>
#include <string.h>
-#define TORTURE_ECHO_SRV_IPV4 "127.0.0.10"
-/* socket wrapper IPv6 prefix fd00::5357:5fxx */
-#define TORTURE_ECHO_SRV_IPV6 "fd00::5357:5f10"
-#define TORTURE_ECHO_SRV_PORT 7
-
struct torture_state {
char *socket_dir;
char *srv_pidfile;
@@ -58,6 +53,9 @@ struct torture_state {
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
#endif
+const char *torture_server_address(int domain);
+int torture_server_port(void);
+
void torture_setup_socket_dir(void **state);
void torture_setup_echo_srv_udp_ipv4(void **state);
void torture_setup_echo_srv_udp_ipv6(void **state);
--
Socket Wrapper Repository
More information about the samba-cvs
mailing list