Skip to content

try to improve error handling #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhthwy wants to merge 6 commits into
base: master
Choose a base branch
from
Open

try to improve error handling #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9451b1
try to improve error handling
dhthwy Nov 22, 2025
4a65d10
tweaks from last commit
dhthwy Nov 22, 2025
c5fc4bb
A little cleanup for Accept() weirdness
dhthwy Nov 22, 2025
8a274e3
Some fixes. Always invalidate socket handle on Close(). Make TCP Flus…
dhthwy Nov 23, 2025
63d8053
Some more error handling. Fix bug: use sizeof on the correct struct.
dhthwy Nov 23, 2025
4a97b4e
fix windows compile
dhthwy Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 33 additions & 27 deletions src/ActiveSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ bool CActiveSocket::ConnectTCP(const char *pAddr, uint16 nPort)
//------------------------------------------------------------------------------
bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
{
bool bRetVal = false;
struct in_addr stIpAddress;

//------------------------------------------------------------------
Expand All @@ -152,7 +151,7 @@ bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
SetSocketError(SocketInvalidAddress);
}
#endif
return bRetVal;
return false;
}

memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
Expand All @@ -161,7 +160,7 @@ bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
{
TranslateSocketError();
return bRetVal;
return false;
}

m_stServerSockaddr.sin_port = htons(nPort);
Expand All @@ -173,16 +172,15 @@ bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
m_timer.Initialize();
m_timer.SetStartTime();

if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) == CSimpleSocket::SocketError)
{
bRetVal = true;
TranslateSocketError();
return false;
}

TranslateSocketError();

m_timer.SetEndTime();

return bRetVal;
return true;
}

//------------------------------------------------------------------------------
Expand All @@ -192,7 +190,6 @@ bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
//------------------------------------------------------------------------------
bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
{
bool bRetVal = false;
struct in_addr stIpAddress;
//------------------------------------------------------------------
// Pre-connection setup that must be preformed
Expand All @@ -210,7 +207,7 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
SetSocketError(SocketInvalidAddress);
}
#endif
return bRetVal;
return false;
}

memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
Expand All @@ -219,7 +216,7 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
{
TranslateSocketError();
return bRetVal;
return false;
}

m_stServerSockaddr.sin_port = htons(nPort);
Expand All @@ -231,16 +228,14 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
m_timer.Initialize();
m_timer.SetStartTime();

if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) == CSimpleSocket::SocketError)
{
bRetVal = true;
TranslateSocketError();
return false;
}

TranslateSocketError();

m_timer.SetEndTime();

return bRetVal;
return true;
}


Expand All @@ -251,26 +246,25 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
//------------------------------------------------------------------------------
bool CActiveSocket::Open(const char *pAddr, uint16 nPort)
{
bool bRetVal = false;

if (IsSocketValid() == false)
{
SetSocketError(CSimpleSocket::SocketInvalidSocket);
return bRetVal;
return false;
}

if (pAddr == NULL)
{
SetSocketError(CSimpleSocket::SocketInvalidAddress);
return bRetVal;
return false;
}

if (nPort == 0)
{
SetSocketError(CSimpleSocket::SocketInvalidPort);
return bRetVal;
return false;
}

bool bRetVal = false;
switch (m_nSocketType)
{
case CSimpleSocket::SocketTypeTcp :
Expand All @@ -294,16 +288,28 @@ bool CActiveSocket::Open(const char *pAddr, uint16 nPort)
//--------------------------------------------------------------------------
if (bRetVal)
{
socklen_t nSockLen = sizeof(struct sockaddr);
socklen_t nSockLen = sizeof(m_stServerSockaddr);

memset(&m_stServerSockaddr, 0, nSockLen);
getpeername(m_socket, (struct sockaddr *)&m_stServerSockaddr, &nSockLen);
if (getpeername(m_socket,
(struct sockaddr *)&m_stServerSockaddr,
&nSockLen) == CSimpleSocket::SocketError)
{
TranslateSocketError();
return false;
}

nSockLen = sizeof(struct sockaddr);
nSockLen = sizeof(m_stClientSockaddr);
memset(&m_stClientSockaddr, 0, nSockLen);
getsockname(m_socket, (struct sockaddr *)&m_stClientSockaddr, &nSockLen);
if (getsockname(m_socket,
(struct sockaddr *)&m_stClientSockaddr,
&nSockLen) == CSimpleSocket::SocketError)
{
TranslateSocketError();
return false;
}

SetSocketError(SocketSuccess);
SetSocketError(CSimpleSocket::SocketSuccess);
}

return bRetVal;
Expand Down
12 changes: 12 additions & 0 deletions src/Host.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,18 @@ extern "C"
#define SHUT_RDWR 2
#define ACCEPT(a,b,c) accept(a,b,c)
#define CONNECT(a,b,c) connect(a,b,c)
// returns -1 on error
#define CLOSE(a) closesocket(a)
#define READ(a,b,c) read(a,b,c)
// returns -1 on error
#define RECV(a,b,c,d) recv(a, (char *)b, c, d)
// returns -1 on error
#define RECVFROM(a,b,c,d,e,f) recvfrom(a, (char *)b, c, d, (sockaddr *)e, (int *)f)
#define RECV_FLAGS MSG_WAITALL
#define SELECT(a,b,c,d,e) select((int32)a,b,c,d,e)
// returns -1 on error
#define SEND(a,b,c,d) send(a, (const char *)b, (int)c, d)
// returns -1 on error
#define SENDTO(a,b,c,d,e,f) sendto(a, (const char *)b, (int)c, d, e, f)
#define SEND_FLAGS 0
#define SENDFILE(a,b,c,d) sendfile(a, b, c, d)
Expand All @@ -172,20 +177,26 @@ extern "C"
#define WRITE(a,b,c) write(a,b,c)
#define WRITEV(a,b,c) Writev(b, c)
#define GETSOCKOPT(a,b,c,d,e) getsockopt(a,b,c,(char *)d, (int *)e)
// returns -1 on error
#define SETSOCKOPT(a,b,c,d,e) setsockopt(a,b,c,(char *)d, (int)e)
#define GETHOSTBYNAME(a) gethostbyname(a)
#endif

#if defined(_LINUX) || defined(_DARWIN)
#define ACCEPT(a,b,c) accept(a,b,c)
#define CONNECT(a,b,c) connect(a,b,c)
// returns -1 on error
#define CLOSE(a) close(a)
#define READ(a,b,c) read(a,b,c)
// returns -1 on error
#define RECV(a,b,c,d) recv(a, (void *)b, c, d)
// returns -1 on error
#define RECVFROM(a,b,c,d,e,f) recvfrom(a, (char *)b, c, d, (sockaddr *)e, f)
#define RECV_FLAGS MSG_WAITALL
#define SELECT(a,b,c,d,e) select(a,b,c,d,e)
// returns -1 on error
#define SEND(a,b,c,d) send(a, (const int8 *)b, c, d)
// returns -1 on error
#define SENDTO(a,b,c,d,e,f) sendto(a, (const int8 *)b, c, d, e, f)
#define SEND_FLAGS 0
#define SENDFILE(a,b,c,d) sendfile(a, b, c, d)
Expand All @@ -195,6 +206,7 @@ extern "C"
#define WRITE(a,b,c) write(a,b,c)
#define WRITEV(a,b,c) writev(a, b, c)
#define GETSOCKOPT(a,b,c,d,e) getsockopt((int)a,(int)b,(int)c,(void *)d,(socklen_t *)e)
// returns -1 on error
#define SETSOCKOPT(a,b,c,d,e) setsockopt((int)a,(int)b,(int)c,(const void *)d,(int)e)
#define GETHOSTBYNAME(a) gethostbyname(a)
#endif
Expand Down
Loading