From d3c101f14b17cd2750a289dda5c2fec82f9b9861 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 2 Sep 2014 12:17:15 +0200 Subject: tests: Pass the sockaddr structure to system functions. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher --- tests/test_echo_tcp_bind.c | 2 +- tests/test_echo_tcp_socket.c | 2 +- tests/test_echo_tcp_socket_options.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c index 705fd8d..b95724d 100644 --- a/tests/test_echo_tcp_bind.c +++ b/tests/test_echo_tcp_bind.c @@ -411,7 +411,7 @@ static void test_bind_on_ipv6_sock(void **state) assert_return_code(s, errno); addr_un.sa.un.sun_family = AF_UNIX; - rc = bind(s, &addr_un.sa.un, addr_un.sa_socklen); + rc = bind(s, &addr_un.sa.s, addr_un.sa_socklen); assert_int_equal(rc, -1); /* FreeBSD uses EINVAL here... */ assert_true(errno == EAFNOSUPPORT || errno == EINVAL); diff --git a/tests/test_echo_tcp_socket.c b/tests/test_echo_tcp_socket.c index ebbe87b..a4b2f89 100644 --- a/tests/test_echo_tcp_socket.c +++ b/tests/test_echo_tcp_socket.c @@ -47,7 +47,7 @@ static void test_socket_getsockname6(void **state) s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); assert_int_not_equal(s, -1); - rc = getsockname(s, &addr.sa.in6, &addr.sa_socklen); + rc = getsockname(s, &addr.sa.s, &addr.sa_socklen); assert_return_code(rc, errno); assert_int_equal(addr.sa.in6.sin6_family, AF_INET6); } diff --git a/tests/test_echo_tcp_socket_options.c b/tests/test_echo_tcp_socket_options.c index ba14e73..dbad41d 100644 --- a/tests/test_echo_tcp_socket_options.c +++ b/tests/test_echo_tcp_socket_options.c @@ -122,7 +122,7 @@ static void test_sockopt_so(void **state) &addr.sa.in.sin_addr); assert_int_equal(rc, 1); - rc = connect(s, &addr.sa.in, addr.sa_socklen); + rc = connect(s, &addr.sa.s, addr.sa_socklen); assert_int_equal(rc, 0); #ifdef SO_DOMAIN @@ -192,7 +192,7 @@ static void test_sockopt_so6(void **state) &addr.sa.in6.sin6_addr); assert_int_equal(rc, 1); - rc = connect(s, &addr.sa.in6, addr.sa_socklen); + rc = connect(s, &addr.sa.s, addr.sa_socklen); assert_int_equal(rc, 0); #ifdef SO_DOMAIN -- cgit