net cleaning: move message_server* to net

SConstruct

@@ -315,13 +315,14 @@ commonFiles += [ "util/background.cpp" , "util/util.cpp" , "util/file_allocator.
                  "util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/signal_handlers.cpp",  
                  "util/histogram.cpp", "util/concurrency/spin_lock.cpp", "util/text.cpp" , "util/stringutils.cpp" ,
                  "util/concurrency/synchronization.cpp" ]
-commonFiles += Glob( "util/*.c" ) + Glob( "util/net/*.cpp" )
+commonFiles += [ "util/net/sock.cpp" ]
+commonFiles += Glob( "util/*.c" ) 
 commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclient_rs.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp client/distlock.cpp s/shardconnection.cpp" )
 
 #mmap stuff
 
 coreDbFiles = [ "db/commands.cpp" ]
-coreServerFiles = [ "util/message_server_port.cpp" , 
+coreServerFiles = [ "util/net/message_server_port.cpp" , 
                     "client/parallel.cpp" , "db/common.cpp", 
                     "util/miniwebserver.cpp" , "db/dbwebserver.cpp" , 
                     "db/matcher.cpp" , "db/dbcommands_generic.cpp" ]
@@ -349,7 +350,7 @@ coreServerFiles += processInfoFiles
 
 
 if has_option( "asio" ):
-    coreServerFiles += [ "util/message_server_asio.cpp" ]
+    coreServerFiles += [ "util/net/message_server_asio.cpp" ]
 
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client libs.
 serverOnlyFiles = Split( "db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/record.cpp db/cursor.cpp db/security.cpp db/queryoptimizer.cpp db/queryoptimizercursor.cpp db/extsort.cpp db/cmdline.cpp" )

db/db.cpp

@@ -37,7 +37,7 @@
 #include "../util/concurrency/task.h"
 #include "../util/version.h"
 #include "../util/ramlog.h"
-#include "../util/message_server.h"
+#include "../util/net/message_server.h"
 #include "client.h"
 #include "restapi.h"
 #include "dbwebserver.h"

s/server.cpp

@@ -20,7 +20,7 @@
 #include "../util/message.h"
 #include "../util/unittest.h"
 #include "../client/connpool.h"
-#include "../util/message_server.h"
+#include "../util/net/message_server.h"
 #include "../util/stringutils.h"
 #include "../util/version.h"
 #include "../util/ramlog.h"

util/net/message_server.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../pch.h"
+#include "../../pch.h"
 
 namespace mongo {
 

util/net/message_server_port.cpp

@@ -15,16 +15,16 @@
  *    limitations under the License.
  */
 
-#include "pch.h"
+#include "../../pch.h"
 
 #ifndef USE_ASIO
 
-#include "message.h"
+#include "../message.h"
 #include "message_server.h"
 
-#include "../db/cmdline.h"
-#include "../db/lasterror.h"
-#include "../db/stats/counters.h"
+#include "../../db/cmdline.h"
+#include "../../db/lasterror.h"
+#include "../../db/stats/counters.h"
 
 namespace mongo {