[tor-commits] [tor/master] Move network_init to lib/net

[nickm@xxxxxxxxxxxxxx]

commit 042df08693521a7cba990489fa03547a6e3fec4c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 28 11:59:16 2018 -0400

    Move network_init to lib/net
---
 src/common/compat.c  | 28 ----------------------------
 src/lib/net/socket.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index e71931aa1..f8333624c 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -429,34 +429,6 @@ compute_num_cpus(void)
   return num_cpus;
 }
 
-/** Called before we make any calls to network-related functions.
- * (Some operating systems require their network libraries to be
- * initialized.) */
-int
-network_init(void)
-{
-#ifdef _WIN32
-  /* This silly exercise is necessary before windows will allow
-   * gethostbyname to work. */
-  WSADATA WSAData;
-  int r;
-  r = WSAStartup(0x101,&WSAData);
-  if (r) {
-    log_warn(LD_NET,"Error initializing windows network layer: code was %d",r);
-    return -1;
-  }
-  if (sizeof(SOCKET) != sizeof(tor_socket_t)) {
-    log_warn(LD_BUG,"The tor_socket_t type does not match SOCKET in size; Tor "
-             "might not work. (Sizes are %d and %d respectively.)",
-             (int)sizeof(tor_socket_t), (int)sizeof(SOCKET));
-  }
-  /* WSAData.iMaxSockets might show the max sockets we're allowed to use.
-   * We might use it to complain if we're trying to be a server but have
-   * too few sockets available. */
-#endif /* defined(_WIN32) */
-  return 0;
-}
-
 #if defined(HW_PHYSMEM64)
 /* This appears to be an OpenBSD thing */
 #define INT64_HW_MEM HW_PHYSMEM64
diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c
index ae384bcd4..dc3d1531f 100644
--- a/src/lib/net/socket.c
+++ b/src/lib/net/socket.c
@@ -25,6 +25,34 @@
 #include <stddef.h>
 #include <string.h>
 
+/** Called before we make any calls to network-related functions.
+ * (Some operating systems require their network libraries to be
+ * initialized.) */
+int
+network_init(void)
+{
+#ifdef _WIN32
+  /* This silly exercise is necessary before windows will allow
+   * gethostbyname to work. */
+  WSADATA WSAData;
+  int r;
+  r = WSAStartup(0x101,&WSAData);
+  if (r) {
+    log_warn(LD_NET,"Error initializing windows network layer: code was %d",r);
+    return -1;
+  }
+  if (sizeof(SOCKET) != sizeof(tor_socket_t)) {
+    log_warn(LD_BUG,"The tor_socket_t type does not match SOCKET in size; Tor "
+             "might not work. (Sizes are %d and %d respectively.)",
+             (int)sizeof(tor_socket_t), (int)sizeof(SOCKET));
+  }
+  /* WSAData.iMaxSockets might show the max sockets we're allowed to use.
+   * We might use it to complain if we're trying to be a server but have
+   * too few sockets available. */
+#endif /* defined(_WIN32) */
+  return 0;
+}
+
 /* When set_max_file_sockets() is called, update this with the max file
  * descriptor value so we can use it to check the limit when opening a new
  * socket. Default value is what Debian sets as the default hard limit. */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits