aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBrent Cook <bcook@rapid7.com>2017-01-15 04:30:41 -0600
committerBrent Cook <busterb@gmail.com>2017-01-15 16:00:16 -0600
commitdfb6b11e5a5ba21c6658d87b4df83c2a05d2deab (patch)
tree8ecf72c600ad63d8eba282b0c64cb0169451620d /tests
parentfa20dae3297fd547341021c7bda9b7a567f6a881 (diff)
downloadportable-dfb6b11e5a5ba21c6658d87b4df83c2a05d2deab.tar.gz
portable-dfb6b11e5a5ba21c6658d87b4df83c2a05d2deab.tar.bz2
portable-dfb6b11e5a5ba21c6658d87b4df83c2a05d2deab.zip
include pipe2/socketpair compat for macOS
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt11
-rw-r--r--tests/Makefile.am3
-rw-r--r--tests/compat/pipe2.c56
3 files changed, 69 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f4277bd..0b2f7fa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -346,7 +346,16 @@ add_test(timingsafe timingsafe)
346 346
347# tlstest 347# tlstest
348if(NOT CMAKE_HOST_WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MINGW") 348if(NOT CMAKE_HOST_WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MINGW")
349add_executable(tlstest tlstest.c) 349
350set(TLSTEST_SRC tlstest.c)
351check_function_exists(pipe2 HAVE_PIPE2)
352if(HAVE_PIPE2)
353 add_definitions(-DHAVE_PIPE2)
354else()
355 set(TLSTEST_SRC ${TLSTEST_SRC} compat/pipe2.c)
356endif()
357
358add_executable(tlstest ${TLSTEST_SRC})
350target_link_libraries(tlstest ${TESTS_LIBS}) 359target_link_libraries(tlstest ${TESTS_LIBS})
351if(NOT MSVC) 360if(NOT MSVC)
352 add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh) 361 add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab1f2f1..57347d6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -337,6 +337,9 @@ if !HOST_WIN
337TESTS += tlstest.sh 337TESTS += tlstest.sh
338check_PROGRAMS += tlstest 338check_PROGRAMS += tlstest
339tlstest_SOURCES = tlstest.c 339tlstest_SOURCES = tlstest.c
340if !HAVE_PIPE2
341tlstest_SOURCES += compat/pipe2.c
342endif
340EXTRA_DIST += tlstest.sh tlstest.bat 343EXTRA_DIST += tlstest.sh tlstest.bat
341endif 344endif
342 345
diff --git a/tests/compat/pipe2.c b/tests/compat/pipe2.c
new file mode 100644
index 0000000..e2aaa28
--- /dev/null
+++ b/tests/compat/pipe2.c
@@ -0,0 +1,56 @@
1/*
2 * Public domain
3 */
4
5#include <fcntl.h>
6#include <unistd.h>
7#include <sys/socket.h>
8#undef socketpair
9
10static int setfd(int fd, int flag)
11{
12 int flags = fcntl(fd, F_GETFD);
13 flags |= flag;
14 return fcntl(fd, F_SETFD, flags);
15}
16
17static int setfl(int fd, int flag)
18{
19 int flags = fcntl(fd, F_GETFL);
20 flags |= flag;
21 return fcntl(fd, F_SETFL, flags);
22}
23
24int pipe2(int fildes[2], int flags)
25{
26 int rc = pipe(fildes);
27 if (rc == 0) {
28 if (flags & O_NONBLOCK) {
29 setfl(fildes[0], O_NONBLOCK);
30 setfl(fildes[1], O_NONBLOCK);
31 }
32 if (flags & O_CLOEXEC) {
33 setfd(fildes[0], FD_CLOEXEC);
34 setfd(fildes[1], FD_CLOEXEC);
35 }
36 }
37 return rc;
38}
39
40int bsd_socketpair(int domain, int type, int protocol, int socket_vector[2])
41{
42 int flags = type & ~0xf;
43 type &= 0xf;
44 int rc = socketpair(domain, type, protocol, socket_vector);
45 if (rc == 0) {
46 if (flags & SOCK_NONBLOCK) {
47 setfl(socket_vector[0], O_NONBLOCK);
48 setfl(socket_vector[1], O_NONBLOCK);
49 }
50 if (flags & SOCK_CLOEXEC) {
51 setfd(socket_vector[0], FD_CLOEXEC);
52 setfd(socket_vector[1], FD_CLOEXEC);
53 }
54 }
55 return rc;
56}