Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.

common/EmuTCPConnection.cpp

@@ -366,7 +366,22 @@ bool EmuTCPConnection::LineOutQueuePush(char* line) {
 			safe_delete_array(line);
 			return(true);
 		}
-
+		if (strcmp(line, "**PACKETMODESS**") == 0) {
+			MSendQueue.lock();
+			safe_delete_array(sendbuf);
+			if (TCPMode == modeConsole)
+				Send((const uchar*) "\0**PACKETMODESS**\r", 18);
+			TCPMode = modePacket;
+			PacketMode = packetModeSocket_Server;
+			EmuTCPNetPacket_Struct* tnps = 0;
+			while ((tnps = InModeQueue.pop())) {
+				SendPacket(tnps);
+				safe_delete_array(tnps);
+			}
+			MSendQueue.unlock();
+			safe_delete_array(line);
+			return(true);
+		}
 	}
 
 	return(TCPConnection::LineOutQueuePush(line));
@@ -419,7 +434,15 @@ bool EmuTCPConnection::ConnectIP(uint32 irIP, uint16 irPort, char* errbuf) {
 				sendbuf_used = sendbuf_size;
 				sendbuf = new uchar[sendbuf_size];
 				memcpy(sendbuf, "\0**PACKETMODEQS**\r", sendbuf_size);
-			} else {
+			} 
+			else if (PacketMode == packetModeSocket_Server) {
+				safe_delete_array(sendbuf);
+				sendbuf_size = 18;
+				sendbuf_used = sendbuf_size;
+				sendbuf = new uchar[sendbuf_size];
+				memcpy(sendbuf, "\0**PACKETMODESS**\r", sendbuf_size);
+			}
+			else {
 				//default: packetModeZone
 				safe_delete_array(sendbuf);
 				sendbuf_size = 20;

common/EmuTCPConnection.h

@@ -30,7 +30,7 @@ class EmuTCPServer;
 class EmuTCPConnection : public TCPConnection {
 public:
 	enum eTCPMode { modeConsole, modeTransition, modePacket };
-	enum ePacketMode { packetModeZone, packetModeLauncher, packetModeLogin, packetModeUCS, packetModeQueryServ };
+	enum ePacketMode { packetModeZone, packetModeLauncher, packetModeLogin, packetModeUCS, packetModeQueryServ, packetModeSocket_Server };
 
 	EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET iSock, uint32 irIP, uint16 irPort, bool iOldFormat = false);
 	EmuTCPConnection(bool iOldFormat = false, EmuTCPServer* iRelayServer = 0, eTCPMode iMode = modePacket);	// for outgoing connections

common/logtypes.h

@@ -65,6 +65,13 @@ LOG_TYPE( QUERYSERV, CLIENT, DISABLED )
 LOG_TYPE( QUERYSERV, TRACE, DISABLED )
 LOG_TYPE( QUERYSERV, PACKETS, DISABLED)
 
+LOG_CATEGORY(SOCKET_SERVER)
+LOG_TYPE(SOCKET_SERVER, INIT, ENABLED)
+LOG_TYPE(SOCKET_SERVER, ERROR, ENABLED)
+LOG_TYPE(SOCKET_SERVER, CLIENT, DISABLED)
+LOG_TYPE(SOCKET_SERVER, TRACE, DISABLED)
+LOG_TYPE(SOCKET_SERVER, PACKETS, DISABLED)
+
 LOG_CATEGORY( SPAWNS )
 LOG_TYPE( SPAWNS, MAIN, DISABLED )
 LOG_TYPE( SPAWNS, CONDITIONS, DISABLED )

common/platform.h

@@ -8,6 +8,7 @@ enum EQEmuExePlatform
 	ExePlatformWorld,
 	ExePlatformLogin,
 	ExePlatformQueryServ,
+	ExePlatformSocket_Server,
 	ExePlatformUCS,
 	ExePlatformLaunch,
 	ExePlatformSharedMemory,