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

Now showing proper error messages when sockets fail :)

Browse Source 
Crossplatform GetLastError function in cSocket

git-svn-id: http://mc-server.googlecode.com/svn/trunk@234 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2012-02-05 16:24:16 +00:00
parent d6925efab3
commit ab95abb6bd
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/cBlockingTCPLink.cpp
View File

@ -84,7 +84,7 @@ bool cBlockingTCPLink::Connect(const char * iAddress, unsigned int iPort)
server.sin_port = htons( (unsigned short)iPort); server.sin_port = htons( (unsigned short)iPort);
if (connect(m_Socket, (struct sockaddr *)&server, sizeof(server))) if (connect(m_Socket, (struct sockaddr *)&server, sizeof(server)))
{ {
LOGWARN("cTCPLink: Connection to \"%s:%d\" failed (%s)", iAddress, iPort, m_Socket.GetLastErrorString()); LOGWARN("cTCPLink: Connection to \"%s:%d\" failed (%s)", iAddress, iPort, cSocket::GetErrorString( cSocket::GetLastError() ).c_str() );
CloseSocket(); CloseSocket();
return false; return false;
} }

2
source/cClientHandle.cpp
View File

@ -1832,7 +1832,7 @@ void cClientHandle::ReceiveThread(void *lpParam)
} }
else else
{ {
LOGERROR("Something went wrong during PacketID 0x%02x (%s)", temp, cSocket::GetLastErrorString()); LOGERROR("Something went wrong during PacketID 0x%02x (%s)", temp, cSocket::GetErrorString( cSocket::GetLastError() ).c_str());
LOG("CLIENT %s DISCONNECTED", self->m_Username.c_str()); LOG("CLIENT %s DISCONNECTED", self->m_Username.c_str());
break; break;
} }

6
source/cServer.cpp
View File

@ -179,7 +179,7 @@ bool cServer::InitServer( int a_Port )
if( !m_pState->SListenClient.IsValid() ) if( !m_pState->SListenClient.IsValid() )
{ {
LOGERROR("m_SListenClient==INVALID_SOCKET (%s)", cSocket::GetLastErrorString() ); LOGERROR("m_SListenClient==INVALID_SOCKET (%s)", cSocket::GetErrorString( cSocket::GetLastError() ).c_str() );
return false; return false;
} }
@ -196,13 +196,13 @@ bool cServer::InitServer( int a_Port )
if( m_pState->SListenClient.Bind( local ) != 0 ) if( m_pState->SListenClient.Bind( local ) != 0 )
{ {
LOGERROR("bind fail (%s)", cSocket::GetLastErrorString() ); LOGERROR("bind fail (%s)", cSocket::GetErrorString( cSocket::GetLastError() ).c_str() );
return false; return false;
} }
if( m_pState->SListenClient.Listen( 10 ) != 0) if( m_pState->SListenClient.Listen( 10 ) != 0)
{ {
LOGERROR("listen fail (%s)", cSocket::GetLastErrorString() ); LOGERROR("listen fail (%s)", cSocket::GetErrorString( cSocket::GetLastError() ).c_str() );
return false; return false;
} }

35
source/cSocket.cpp
View File

@ -92,7 +92,7 @@ void cSocket::CloseSocket()
const char * cSocket::GetLastErrorString() AString cSocket::GetErrorString( int a_ErrNo )
{ {
#define CASE_AND_RETURN(x) case x: return #x #define CASE_AND_RETURN(x) case x: return #x
@ -118,7 +118,27 @@ const char * cSocket::GetLastErrorString()
} }
return "No Error"; return "No Error";
#else #else
return "GetLastErrorString() only works on Windows"; char buffer[ 256 ];
if( strerror_r( errno, buffer, 256 ) == 0 )
{
return AString( buffer );
}
else
{
return "Error on getting error string!";
}
#endif
}
int cSocket::GetLastError()
{
#ifdef _WIN32
return WSAGetLastError();
#else
return errno;
#endif #endif
} }
@ -176,16 +196,7 @@ int cSocket::Bind(SockAddr_In& a_Address)
local.sin_port=htons((u_short)a_Address.Port); local.sin_port=htons((u_short)a_Address.Port);
int res = bind(m_Socket, (sockaddr*)&local, sizeof(local)); return bind(m_Socket, (sockaddr*)&local, sizeof(local));
if (res != 0)
{
#ifdef _WIN32
LOGWARNING("bind() failed for port %d, WSAGLE = %d", a_Address.Port, WSAGetLastError());
#else // _WIN32
LOGWARNING("bind() failed for port %d, errno = %d", a_Address.Port, errno);
#endif // else _WIN32
}
return res;
} }

3
source/cSocket.h
View File

@ -28,7 +28,8 @@ public:
int SetReuseAddress(); int SetReuseAddress();
static int WSAStartup(); static int WSAStartup();
static const char* GetLastErrorString(); static AString GetErrorString( int a_ErrNo );
static int GetLastError();
static cSocket CreateSocket(); static cSocket CreateSocket();
inline static bool IsSocketError( int a_ReturnedValue ) inline static bool IsSocketError( int a_ReturnedValue )