[tor-commits] [tor/master] Split the socketpair replacement code into its own function for testing

[nickm at torproject.org]

commit d6adf055828283dda2ca9c0c77a80348778c45df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 2 10:36:01 2013 -0400

    Split the socketpair replacement code into its own function for testing
---
 src/common/compat.c |   17 +++++++++++++++--
 src/common/compat.h |    9 +++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 8aab12a..d69e3b0 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -23,6 +23,7 @@
  * we can also take out the configure check. */
 #define _GNU_SOURCE
 
+#define COMPAT_PRIVATE
 #include "compat.h"
 
 #ifdef _WIN32
@@ -1291,6 +1292,18 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
 
   return 0;
 #else
+  return tor_ersatz_socketpair(family, type, protocol, fd);
+#endif
+}
+
+#ifdef NEED_ERSATZ_SOCKETPAIR
+/**
+ * Helper used to implement socketpair on systems that lack it, by
+ * making a direct connection to localhost.
+ */
+STATIC int
+tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
+{
     /* This socketpair does not work when localhost is down. So
      * it's really not the same thing at all. But it's close enough
      * for now, and really, when localhost is down sometimes, we
@@ -1301,7 +1314,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
     tor_socket_t acceptor = -1;
     struct sockaddr_in listen_addr;
     struct sockaddr_in connect_addr;
-    int size;
+    socklen_t size;
     int saved_errno = -1;
 
     if (protocol
@@ -1384,8 +1397,8 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
     if (acceptor != -1)
       tor_close_socket(acceptor);
     return -saved_errno;
-#endif
 }
+#endif
 
 /** Number of extra file descriptors to keep in reserve beyond those that we
  * tell Tor it's allowed to use. */
diff --git a/src/common/compat.h b/src/common/compat.h
index 89a5d7f..8e700a9 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -8,6 +8,7 @@
 
 #include "orconfig.h"
 #include "torint.h"
+#include "testsupport.h"
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
@@ -738,5 +739,13 @@ char *format_win32_error(DWORD err);
 
 #endif
 
+#ifdef COMPAT_PRIVATE
+#if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS)
+#define NEED_ERSATZ_SOCKETPAIR
+STATIC int tor_ersatz_socketpair(int family, int type, int protocol,
+                                   tor_socket_t fd[2]);
+#endif
+#endif
+
 #endif