net cleaning: re-organizing file

1 files changed, 27 insertions, 20 deletions

diff --git a/util/net/sock.cpp b/util/net/sock.cpp
index a81462d5696..bd860c107fd 100644
--- a/util/net/sock.cpp
+++ b/util/net/sock.cpp
@@ -20,12 +20,12 @@
 
 namespace mongo {
 
-    static mongo::mutex sock_mutex("sock_mutex");
-
     static bool ipv6 = false;
     void enableIPv6(bool state) { ipv6 = state; }
     bool IPv6Enabled() { return ipv6; }
 
+    // --- SockAddr
+
     SockAddr::SockAddr(int sourcePort) {
         memset(as<sockaddr_in>().sin_zero, 0, sizeof(as<sockaddr_in>().sin_zero));
         as<sockaddr_in>().sin_family = AF_INET;
@@ -97,6 +97,11 @@ namespace mongo {
         return false;
     }
 
+    SockAddr unknownAddress( "0.0.0.0", 0 );
+
+
+    // ------ hostname -------------------
+
     string hostbyname(const char *hostname) {
         string addr =  SockAddr(hostname, 0).getAddr();
         if (addr == "0.0.0.0")
@@ -105,24 +110,6 @@ namespace mongo {
             return addr;
     }
 
-#if defined(_WIN32)
-    namespace {
-        struct WinsockInit {
-            WinsockInit() {
-                WSADATA d;
-                if ( WSAStartup(MAKEWORD(2,2), &d) != 0 ) {
-                    out() << "ERROR: wsastartup failed " << errnoWithDescription() << endl;
-                    problem() << "ERROR: wsastartup failed " << errnoWithDescription() << endl;
-                    dbexit( EXIT_NTSERVICE_ERROR );
-                }
-            }
-        } winsock_init;
-    }
-#endif
-
-    SockAddr unknownAddress( "0.0.0.0", 0 );
-
-
     string _hostNameCached;
     static void _hostNameCachedInit() {
         _hostNameCached = getHostName();
@@ -134,6 +121,8 @@ namespace mongo {
         return _hostNameCached;
     }
 
+    // --------- SocketException ----------
+
     string SocketException::toString() const {
         stringstream ss;
         ss << _ei.code << " socket exception [" << _type << "] ";
@@ -148,6 +137,24 @@ namespace mongo {
     }
 
 
+    // ---------- global init -------------
+
+
+#if defined(_WIN32)
+    struct WinsockInit {
+        WinsockInit() {
+            WSADATA d;
+            if ( WSAStartup(MAKEWORD(2,2), &d) != 0 ) {
+                out() << "ERROR: wsastartup failed " << errnoWithDescription() << endl;
+                problem() << "ERROR: wsastartup failed " << errnoWithDescription() << endl;
+                dbexit( EXIT_NTSERVICE_ERROR );
+            }
+        }
+    } winsock_init;
+#endif
+
+
+
 
 
 } // namespace mongo