tests: use torture_client_port/address in test_bind_ipv4_addr_in_use()

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c
index 103a55e666a3ff67e45d9f5036819b3f7f04f08b..83ea427af4ee8b22ee3edfb61d87f29a2c279497 100644 (file)
--- a/tests/test_echo_tcp_bind.c
+++ b/tests/test_echo_tcp_bind.c
@@ -208,7 +208,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
        ZERO_STRUCT(sin);
        sin.sin_family = AF_INET;
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s, (struct sockaddr *)&sin, slen);
@@ -226,7 +226,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -241,9 +241,9 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -261,9 +261,9 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin);
        sin.sin_family = AF_INET;
-       sin.sin_port = htons(12345);
+       sin.sin_port = htons(torture_client_port());
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s, (struct sockaddr *)&sin, slen);
@@ -281,7 +281,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -298,7 +298,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
        sin2.sin_family = AF_INET;
        sin2.sin_port = htons(54321);
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -313,9 +313,9 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -345,7 +345,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
        sin2.sin_addr.s_addr = htonl(INADDR_ANY);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -391,7 +391,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
        sin2.sin_addr.s_addr = htonl(INADDR_ANY);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -407,7 +407,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -422,9 +422,9 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -442,7 +442,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin);
        sin.sin_family = AF_INET;
-       sin.sin_port = htons(12345);
+       sin.sin_port = htons(torture_client_port());
        sin.sin_addr.s_addr = htonl(INADDR_ANY);
 
        rc = bind(s, (struct sockaddr *)&sin, slen);
@@ -469,7 +469,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
        sin2.sin_addr.s_addr = htonl(INADDR_ANY);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);
@@ -485,9 +485,9 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
        ZERO_STRUCT(sin2);
        sin2.sin_family = AF_INET;
-       sin2.sin_port = htons(12345);
+       sin2.sin_port = htons(torture_client_port());
 
-       rc = inet_pton(AF_INET, "127.0.0.20", &sin2.sin_addr);
+       rc = inet_pton(AF_INET, torture_client_address(AF_INET), &sin2.sin_addr);
        assert_int_equal(rc, 1);
 
        rc = bind(s2, (struct sockaddr *)&sin2, slen);