sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/TcpClient: Remove unreliable QueryState() 

Former-commit-id: 75d61ca0d84150a278c168c81af4c755e8a74d91
This commit is contained in:
Lynix 2015-11-13 14:17:43 +01:00
parent a324f44901
commit 3a4acd9584
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Network/TcpClient.hpp
View File

@ -37,8 +37,6 @@ namespace Nz
inline bool IsLowDelayEnabled() const; inline bool IsLowDelayEnabled() const;
inline bool IsKeepAliveEnabled() const; inline bool IsKeepAliveEnabled() const;
SocketState QueryState();
bool Receive(void* buffer, std::size_t size, std::size_t* received); bool Receive(void* buffer, std::size_t size, std::size_t* received);
bool Send(const void* buffer, std::size_t size, std::size_t* sent); bool Send(const void* buffer, std::size_t size, std::size_t* sent);

56
src/Nazara/Network/TcpClient.cpp
View File

@ -92,62 +92,6 @@ namespace Nz
} }
} }
SocketState TcpClient::QueryState()
{
// Only check state if we have a valid handle, else we're not connected.
if (m_handle != SocketImpl::InvalidHandle)
{
// Check our state depending on our last state
switch (m_state)
{
case SocketState_Connecting:
{
// If we were connecting, check how it's going
SocketError getError;
SocketError error = SocketImpl::GetLastError(m_handle, &getError);
if (getError != SocketError_NoError)
break; //< Do not update state if we cannot get socket state
if (error == SocketError_NoError)
{
// No error yet, we're still connecting or connected, check that by calling Connect again
return Connect(m_peerAddress);
}
else
{
// Our connection attempt failed
m_lastError = error;
UpdateState(SocketState_NotConnected);
}
break;
}
default:
{
// Check our peer address, if it works we're connected
SocketError error;
m_peerAddress = SocketImpl::QueryPeerAddress(m_handle, &error);
if (m_peerAddress == IpAddress::Invalid)
{
// Other errors mean a problem while getting the peer address
if (error == SocketError_ConnectionClosed)
UpdateState(SocketState_NotConnected);
}
else
UpdateState(SocketState_Connected); // If we are not connecting and have a peer address, we are connected
break;
}
}
}
else
UpdateState(SocketState_NotConnected);
return m_state;
}
bool TcpClient::Receive(void* buffer, std::size_t size, std::size_t* received) bool TcpClient::Receive(void* buffer, std::size_t size, std::size_t* received)
{ {
NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Invalid handle"); NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Invalid handle");