[SCM] Socket Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Dec 23 04:22:43 MST 2013
The branch, master has been updated
via b7f7ed3 torture: Add TORTURE_SKIP_CLEANUP to not delete socket_dir.
via 4373b71 torture: Generate network traces for each test.
via 98fa90d tests: Add test_echo_tcp_socket_options().
via 6876e0c tests: Add test_echo_tcp_connect test.
from 8c561dd tests: Add missing include for writev/readv.
http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b7f7ed387070f48f6ef4ebfe5a4d9315010b6288
Author: Andreas Schneider <asn at samba.org>
Date: Mon Dec 23 12:17:46 2013 +0100
torture: Add TORTURE_SKIP_CLEANUP to not delete socket_dir.
commit 4373b7191f3533e1b19a6a848f4ce682cea09bfa
Author: Andreas Schneider <asn at samba.org>
Date: Mon Dec 23 12:17:02 2013 +0100
torture: Generate network traces for each test.
commit 98fa90dcf36cd6f95c6d1468224e5f5e9314c079
Author: Andreas Schneider <asn at samba.org>
Date: Mon Dec 23 11:58:19 2013 +0100
tests: Add test_echo_tcp_socket_options().
commit 6876e0ca0906c6438bd2eb6d6b64e28372359e40
Author: Andreas Schneider <asn at samba.org>
Date: Mon Dec 23 10:59:59 2013 +0100
tests: Add test_echo_tcp_connect test.
This tests some corner cases we fixed in the past.
-----------------------------------------------------------------------
Summary of changes:
tests/CMakeLists.txt | 9 ++-
tests/test_echo_tcp_connect.c | 95 +++++++++++++++++++++
tests/test_echo_tcp_socket_options.c | 151 ++++++++++++++++++++++++++++++++++
tests/torture.c | 25 +++++-
tests/torture.h | 1 +
5 files changed, 276 insertions(+), 5 deletions(-)
create mode 100644 tests/test_echo_tcp_connect.c
create mode 100644 tests/test_echo_tcp_socket_options.c
Changeset truncated at 500 lines:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 23f362d..45db1db 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,7 +17,14 @@ target_link_libraries(${TORTURE_LIBRARY}
${CMOCKA_LIBRARY}
${SWRAP_REQUIRED_LIBRARIES})
-set(SWRAP_TESTS test_ioctl test_echo_udp_sendto_recvfrom test_echo_udp_send_recv test_echo_tcp_write_read test_echo_tcp_writev_readv)
+set(SWRAP_TESTS
+ test_ioctl
+ test_echo_tcp_connect
+ test_echo_tcp_socket_options
+ test_echo_tcp_write_read
+ test_echo_tcp_writev_readv
+ test_echo_udp_sendto_recvfrom
+ test_echo_udp_send_recv)
foreach(_SWRAP_TEST ${SWRAP_TESTS})
add_cmocka_test(${_SWRAP_TEST} ${_SWRAP_TEST}.c ${TORTURE_LIBRARY})
diff --git a/tests/test_echo_tcp_connect.c b/tests/test_echo_tcp_connect.c
new file mode 100644
index 0000000..b20e453
--- /dev/null
+++ b/tests/test_echo_tcp_connect.c
@@ -0,0 +1,95 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "config.h"
+#include "torture.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+static void setup_echo_srv_tcp_ipv4(void **state)
+{
+ torture_setup_echo_srv_tcp_ipv4(state);
+}
+
+static void teardown(void **state)
+{
+ torture_teardown_echo_srv(state);
+}
+
+static void test_connect_broadcast_ipv4(void **state)
+{
+ struct sockaddr_in sin;
+ socklen_t slen = sizeof(struct sockaddr_in);
+ int rc;
+ int s;
+
+ (void) state; /* unused */
+
+ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ assert_int_not_equal(s, -1);
+
+ ZERO_STRUCT(sin);
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(torture_server_port());
+ sin.sin_addr.s_addr = INADDR_BROADCAST;
+
+ /* We don't allow connect to broadcast addresses */
+ rc = connect(s, (struct sockaddr *)&sin, slen);
+ assert_int_equal(rc, -1);
+
+ close(s);
+}
+
+#ifdef HAVE_IPV6
+static void test_connect_downgrade_ipv6(void **state)
+{
+ struct sockaddr_in sin;
+ socklen_t slen = sizeof(struct sockaddr_in);
+ int rc;
+ int s;
+
+ (void) state; /* unused */
+
+ s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+ assert_int_not_equal(s, -1);
+
+ ZERO_STRUCT(sin);
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(torture_server_port());
+
+ rc = inet_pton(sin.sin_family,
+ torture_server_address(AF_INET),
+ &sin.sin_addr);
+ assert_int_equal(rc, 1);
+
+ /* Connect should downgrade to IPv4 and allow the connect */
+ rc = connect(s, (struct sockaddr *)&sin, slen);
+ assert_int_equal(rc, 0);
+
+ close(s);
+}
+#endif
+
+int main(void) {
+ int rc;
+
+ const UnitTest tests[] = {
+ unit_test_setup_teardown(test_connect_broadcast_ipv4, setup_echo_srv_tcp_ipv4, teardown),
+#ifdef HAVE_IPV6
+ unit_test_setup_teardown(test_connect_downgrade_ipv6, setup_echo_srv_tcp_ipv4, teardown),
+#endif
+ };
+
+ rc = run_tests(tests);
+
+ return rc;
+}
diff --git a/tests/test_echo_tcp_socket_options.c b/tests/test_echo_tcp_socket_options.c
new file mode 100644
index 0000000..798d612
--- /dev/null
+++ b/tests/test_echo_tcp_socket_options.c
@@ -0,0 +1,151 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "config.h"
+#include "torture.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#ifndef ZERO_STRUCT
+#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
+#endif
+
+static void setup_echo_srv_tcp_ipv4(void **state)
+{
+ torture_setup_echo_srv_tcp_ipv4(state);
+}
+
+#ifdef HAVE_IPV6
+static void setup_ipv6(void **state)
+{
+ torture_setup_socket_dir(state);
+}
+#endif
+
+static void teardown(void **state)
+{
+ torture_teardown_echo_srv(state);
+}
+
+static void test_sockopt_sndbuf(void **state)
+{
+ struct sockaddr_in sin;
+ socklen_t slen = sizeof(struct sockaddr_in);
+ int obufsize = 0;
+ socklen_t olen = 0;
+ int gbufsize = 0;
+ socklen_t glen = 0;
+ int sbufsize = 0;
+ int rc;
+ int s;
+
+ (void) state; /* unused */
+
+ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ assert_int_not_equal(s, -1);
+
+ ZERO_STRUCT(sin);
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(torture_server_port());
+
+ 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);
+ assert_int_equal(rc, 0);
+
+ rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, &obufsize, &olen);
+ assert_int_equal(rc, 0);
+
+ sbufsize = ((obufsize + 1023) & (~1023));
+ rc = setsockopt(s, SOL_SOCKET, SO_SNDBUF, &sbufsize, sizeof(sbufsize));
+ assert_int_equal(rc, 0);
+
+ rc = getsockopt(s, SOL_SOCKET, SO_SNDBUF, &gbufsize, &glen);
+ assert_int_equal(rc, 0);
+
+ assert_int_equal(gbufsize, sbufsize);
+
+ close(s);
+}
+
+#ifdef HAVE_IPV6
+static void test_bind_ipv6_only(void **state)
+{
+ struct addrinfo hints;
+ struct addrinfo *res, *ri;
+ char svc[] = "7777";
+ int rc;
+ int s;
+
+ (void) state; /* unused */
+
+ ZERO_STRUCT(hints);
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_PASSIVE;
+
+ rc = getaddrinfo(torture_server_address(AF_INET6), svc, &hints, &res);
+ assert_int_equal(rc, 0);
+
+ for (ri = res; ri != NULL; ri = ri->ai_next) {
+ int one = 1;
+
+ s = socket(ri->ai_family,
+ ri->ai_socktype,
+ ri->ai_protocol);
+ assert_int_not_equal(rc, -1);
+
+ rc = setsockopt(s,
+ IPPROTO_IPV6,
+ IPV6_V6ONLY,
+ (const void *)&one,
+ sizeof(one));
+ switch(ri->ai_family) {
+ case AF_INET:
+ assert_int_equal(rc, -1);
+
+ close(s);
+ break;
+ case AF_INET6:
+ assert_int_equal(rc, 0);
+
+ rc = bind(s, ri->ai_addr, ri->ai_addrlen);
+ assert_int_equal(rc, 0);
+
+ close(s);
+ break;
+ default:
+ break;
+ }
+ }
+ freeaddrinfo(res);
+}
+#endif
+
+int main(void) {
+ int rc;
+
+ const UnitTest tests[] = {
+ unit_test_setup_teardown(test_sockopt_sndbuf, setup_echo_srv_tcp_ipv4, teardown),
+#ifdef HAVE_IPV6
+ unit_test_setup_teardown(test_bind_ipv6_only, setup_ipv6, teardown),
+#endif
+ };
+
+ rc = run_tests(tests);
+
+ return rc;
+}
diff --git a/tests/torture.c b/tests/torture.c
index a441ec3..8c9e0db 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -56,6 +56,7 @@
#define TORTURE_SOCKET_DIR "/tmp/test_socket_wrapper_XXXXXX"
#define TORTURE_ECHO_SRV_PIDFILE "echo_srv.pid"
+#define TORTURE_PCAP_FILE "socket_trace.pcap"
const char *torture_server_address(int family)
{
@@ -115,6 +116,15 @@ void torture_setup_socket_dir(void **state)
p = mkdtemp(s->socket_dir);
assert_non_null(p);
+ /* pcap file */
+ len = strlen(p) + 1 + strlen(TORTURE_PCAP_FILE) + 1;
+
+ s->pcap_file = malloc(len);
+ assert_non_null(s->pcap_file);
+
+ snprintf(s->pcap_file, len, "%s/%s", p, TORTURE_PCAP_FILE);
+
+ /* pid file */
len = strlen(p) + 1 + strlen(TORTURE_ECHO_SRV_PIDFILE) + 1;
s->srv_pidfile = malloc(len);
@@ -124,6 +134,7 @@ void torture_setup_socket_dir(void **state)
setenv("SOCKET_WRAPPER_DIR", p, 1);
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "170", 1);
+ setenv("SOCKET_WRAPPER_PCAP_FILE", s->pcap_file, 1);
*state = s;
}
@@ -205,17 +216,23 @@ void torture_setup_echo_srv_tcp_ipv6(void **state)
void torture_teardown_socket_dir(void **state)
{
struct torture_state *s = *state;
+ char *env = getenv("TORTURE_SKIP_CLEANUP");
char remove_cmd[1024] = {0};
int rc;
- snprintf(remove_cmd, sizeof(remove_cmd), "rm -rf %s", s->socket_dir);
+ if (env != NULL && env[0] == '1') {
+ fprintf(stderr, ">>> Skipping cleanup of %s", s->socket_dir);
+ } else {
+ snprintf(remove_cmd, sizeof(remove_cmd), "rm -rf %s", s->socket_dir);
- rc = system(remove_cmd);
- if (rc < 0) {
- fprintf(stderr, "%s failed: %s", remove_cmd, strerror(errno));
+ rc = system(remove_cmd);
+ if (rc < 0) {
+ fprintf(stderr, "%s failed: %s", remove_cmd, strerror(errno));
+ }
}
free(s->socket_dir);
+ free(s->pcap_file);
free(s->srv_pidfile);
free(s);
}
diff --git a/tests/torture.h b/tests/torture.h
index 241b4a7..ffc3567 100644
--- a/tests/torture.h
+++ b/tests/torture.h
@@ -46,6 +46,7 @@
struct torture_state {
char *socket_dir;
+ char *pcap_file;
char *srv_pidfile;
};
--
Socket Wrapper Repository
More information about the samba-cvs
mailing list