VersionManager: Strip "client" sockets

"Client" sockets as in the VersionManager acts as a client to connect to something else.
Stripping these as they're unused and reduce the overall code to migrate.

Author: twostars

Server/VersionManager/Define.h

@@ -14,7 +14,6 @@
 constexpr int MAX_USER				= 3000;
 
 constexpr int _LISTEN_PORT			= 15100;
-constexpr int CLIENT_SOCKSIZE		= 10;
 constexpr int DB_PROCESS_TIMEOUT	= 100;
 
 ////////////////////////////////////////////////////////////
@@ -33,10 +32,6 @@ constexpr int DB_PROCESS_TIMEOUT	= 100;
 #define STATE_DISCONNECTED		0X02
 #define STATE_GAMESTART			0x03
 
-// Socket type
-#define TYPE_ACCEPT				0x01
-#define TYPE_CONNECT			0x02
-
 // Overlapped flag
 #define OVL_RECEIVE				0X01
 #define OVL_SEND				0X02

Server/VersionManager/IOCPSocket2.cpp

@@ -22,7 +22,6 @@ CIOCPSocket2::CIOCPSocket2()
 	m_Socket = INVALID_SOCKET;
 
 	m_pIOCPort = nullptr;
-	m_Type = TYPE_ACCEPT;
 }
 
 CIOCPSocket2::~CIOCPSocket2()
@@ -54,49 +53,6 @@ bool CIOCPSocket2::Create(UINT nSocketPort, int nSocketType, long lEvent, const
 	return true;
 }
 
-bool CIOCPSocket2::Connect(CIOCPort* pIocp, const char* lpszHostAddress, UINT nHostPort)
-{
-	sockaddr_in addr;
-
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = inet_addr(lpszHostAddress);
-	addr.sin_port = htons(nHostPort);
-
-	int result = connect(m_Socket, (sockaddr*) &addr, sizeof(addr));
-	if (result == SOCKET_ERROR)
-	{
-		int err = WSAGetLastError();
-//		TRACE("CONNECT FAIL : %d\n", err);
-		closesocket(m_Socket);
-		return false;
-	}
-
-	ASSERT(pIocp);
-
-	InitSocket(pIocp);
-
-	m_Sid = m_pIOCPort->GetClientSid();
-	if (m_Sid < 0)
-		return false;
-
-	m_pIOCPort->m_ClientSockArray[m_Sid] = this;
-
-	if (!m_pIOCPort->Associate(this, m_pIOCPort->m_hClientIOCPort))
-	{
-		spdlog::error("IOCPSocket2::Connect: failed to associate");
-		return false;
-	}
-
-	m_ConnectAddress = lpszHostAddress;
-	m_State = STATE_CONNECTED;
-	m_Type = TYPE_CONNECT;
-
-	Receive();
-
-	return true;
-}
-
 int CIOCPSocket2::Send(char* pBuf, long length, int dwFlag)
 {
 	int ret_value = 0;
@@ -172,11 +128,7 @@ int CIOCPSocket2::Send(char* pBuf, long length, int dwFlag)
 	pOvl = &m_RecvOverlapped;
 	pOvl->Offset = OVL_CLOSE;
 
-	if (m_Type == TYPE_ACCEPT)
-		hComport = m_pIOCPort->m_hServerIOCPort;
-	else
-		hComport = m_pIOCPort->m_hClientIOCPort;
-
+	hComport = m_pIOCPort->m_hServerIOCPort;
 	PostQueuedCompletionStatus(hComport, 0, m_Sid, pOvl);
 
 	return -1;
@@ -237,11 +189,7 @@ int CIOCPSocket2::Receive()
 	pOvl = &m_RecvOverlapped;
 	pOvl->Offset = OVL_CLOSE;
 
-	if (m_Type == TYPE_ACCEPT)
-		hComport = m_pIOCPort->m_hServerIOCPort;
-	else
-		hComport = m_pIOCPort->m_hClientIOCPort;
-
+	hComport = m_pIOCPort->m_hServerIOCPort;
 	PostQueuedCompletionStatus(hComport, 0, m_Sid, pOvl);
 
 	return -1;
@@ -351,27 +299,6 @@ bool CIOCPSocket2::PullOutCore(char*& data, int& length)
 	return foundCore;
 }
 
-bool CIOCPSocket2::AsyncSelect(long lEvent)
-{
-	int retEventResult, err;
-
-	retEventResult = WSAEventSelect(m_Socket, m_hSockEvent, lEvent);
-	err = WSAGetLastError();
-	return (retEventResult == 0);
-}
-
-bool CIOCPSocket2::SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel)
-{
-	int retValue = setsockopt(m_Socket, nLevel, nOptionName, (char*) lpOptionValue, nOptionLen);
-	return (retValue == 0);
-}
-
-bool CIOCPSocket2::ShutDown(int nHow)
-{
-	int retValue = shutdown(m_Socket, nHow);
-	return (retValue == 0);
-}
-
 void CIOCPSocket2::Close()
 {
 	if (m_pIOCPort == nullptr)
@@ -382,10 +309,7 @@ void CIOCPSocket2::Close()
 	pOvl = &m_RecvOverlapped;
 	pOvl->Offset = OVL_CLOSE;
 
-	if (m_Type == TYPE_ACCEPT)
-		hComport = m_pIOCPort->m_hServerIOCPort;
-	else
-		hComport = m_pIOCPort->m_hClientIOCPort;
+	hComport = m_pIOCPort->m_hServerIOCPort;
 
 	int retValue = PostQueuedCompletionStatus(hComport, 0, m_Sid, pOvl);
 	if (retValue == 0)

Server/VersionManager/IOCPSocket2.h

@@ -12,25 +12,16 @@
 #include "IOCPort.h"
 #include "Define.h"
 
-#define receives				0
-#define sends					1
-#define both					2 
-
 class CCircularBuffer;
-
 class CIOCPSocket2
 {
 public:
 	void InitSocket(CIOCPort* pIOCPort);
 	void Close();
-	bool AsyncSelect(long lEvent = FD_READ | FD_WRITE | FD_OOB | FD_ACCEPT | FD_CONNECT | FD_CLOSE);
-	bool SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel = SOL_SOCKET);
-	bool ShutDown(int nHow = sends);
 	bool PullOutCore(char*& data, int& length);
 	void ReceivedData(int length);
 	int  Receive();
 	int  Send(char* pBuf, long length, int dwFlag = 0);
-	bool Connect(CIOCPort* pIocp, const char* lpszHostAddress, UINT nHostPort);
 	bool Create(UINT nSocketPort = 0,
 				 int nSocketType = SOCK_STREAM,
 				 long lEvent = FD_READ | FD_WRITE | FD_OOB | FD_ACCEPT | FD_CONNECT | FD_CLOSE,
@@ -53,10 +44,6 @@ class CIOCPSocket2
 		return m_State;
 	}
 
-	uint8_t GetSockType() const {
-		return m_Type;
-	}
-
 	virtual void CloseProcess();
 	virtual void Parsing(int length, char* pData);
 	virtual void Initialize();
@@ -82,7 +69,6 @@ class CIOCPSocket2
 	OVERLAPPED			m_RecvOverlapped;
 	OVERLAPPED			m_SendOverlapped;
 
-	uint8_t				m_Type;
 	uint8_t				m_State;
 	int					m_Sid;
 	std::string			m_ConnectAddress;