From 6ed6dffbe79bcf95e2ed5593eee94ab32fcde3f4 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 2 Oct 2012 01:48:22 +0200 Subject: [PATCH] select, poll tests: Make setsockopt invocation effective. * tests/test-poll.c (open_server_socket): Move setsockopt() call before the bind() call. * tests/test-select.h (open_server_socket): Likewise. --- ChangeLog | 7 +++++++ tests/test-poll.c | 6 +++--- tests/test-select.h | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1565dfbe7..eb8e32933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-10-01 Ed Maste (tiny change) + + select, poll tests: Make setsockopt invocation effective. + * tests/test-poll.c (open_server_socket): Move setsockopt() call before + the bind() call. + * tests/test-select.h (open_server_socket): Likewise. + 2012-09-30 Paul Eggert sockets, sys_stat: restore AC_C_INLINE diff --git a/tests/test-poll.c b/tests/test-poll.c index 7ba02805d..69a30f0a2 100644 --- a/tests/test-poll.c +++ b/tests/test-poll.c @@ -96,6 +96,9 @@ open_server_socket () s = socket (AF_INET, SOCK_STREAM, 0); + x = 1; + setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); + memset (&ia, 0, sizeof (ia)); ia.sin_family = AF_INET; inet_pton (AF_INET, "127.0.0.1", &ia.sin_addr); @@ -106,9 +109,6 @@ open_server_socket () exit (77); } - x = 1; - setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); - if (listen (s, 1) < 0) { perror ("listen"); diff --git a/tests/test-select.h b/tests/test-select.h index 1169e5929..af0e38cf0 100644 --- a/tests/test-select.h +++ b/tests/test-select.h @@ -84,6 +84,9 @@ open_server_socket (void) s = socket (AF_INET, SOCK_STREAM, 0); + x = 1; + setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); + memset (&ia, 0, sizeof (ia)); ia.sin_family = AF_INET; inet_pton (AF_INET, "127.0.0.1", &ia.sin_addr); @@ -94,9 +97,6 @@ open_server_socket (void) exit (77); } - x = 1; - setsockopt (s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x)); - if (listen (s, 1) < 0) { perror ("listen"); -- 2.11.0