flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Sockets are now owned by SocketThreads instead of ClientHandle (FS #246 and FS #247)

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@891 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-09-25 08:23:19 +00:00
parent 24e94e7516
commit 7a43f6be09
13 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/Server.cpp
View File

@@ -113,27 +113,27 @@ void cServer::NotifyClientWrite(const cClientHandle * a_Client)
void cServer::WriteToClient(const cSocket * a_Socket, const AString & a_Data)
void cServer::WriteToClient(const cClientHandle * a_Client, const AString & a_Data)
{
m_SocketThreads.Write(a_Socket, a_Data);
m_SocketThreads.Write(a_Client, a_Data);
}
void cServer::QueueClientClose(const cSocket * a_Socket)
void cServer::QueueClientClose(const cClientHandle * a_Client)
{
m_SocketThreads.QueueClose(a_Socket);
m_SocketThreads.QueueClose(a_Client);
}
void cServer::RemoveClient(const cSocket * a_Socket)
void cServer::RemoveClient(const cClientHandle * a_Client)
{
m_SocketThreads.RemoveClient(a_Socket);
m_SocketThreads.RemoveClient(a_Client);
}
@@ -340,8 +340,8 @@ void cServer::StartListenClient()
LOG("Client \"%s\" connected!", ClientIP.c_str());
cClientHandle *NewHandle = new cClientHandle(SClient, m_ClientViewDistance);
if (!m_SocketThreads.AddClient(&(NewHandle->GetSocket()), NewHandle))
cClientHandle * NewHandle = new cClientHandle(&SClient, m_ClientViewDistance);
if (!m_SocketThreads.AddClient(SClient, NewHandle))
{
// For some reason SocketThreads have rejected the handle, clean it up
LOGERROR("Client \"%s\" cannot be handled, server probably unstable", SClient.GetIPString().c_str());