Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
@@ -53,77 +53,77 @@ CActiveSocket::CActiveSocket(CSocketType nType) : CSimpleSocket(nType)
|
||||
//------------------------------------------------------------------------------
|
||||
bool CActiveSocket::ConnectTCP(const char *pAddr, uint16 nPort)
|
||||
{
|
||||
bool bRetVal = false;
|
||||
struct in_addr stIpAddress;
|
||||
bool bRetVal = false;
|
||||
struct in_addr stIpAddress;
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// Preconnection setup that must be preformed
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
//------------------------------------------------------------------
|
||||
// Preconnection setup that must be preformed
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
#ifdef WIN32
|
||||
TranslateSocketError();
|
||||
TranslateSocketError();
|
||||
#else
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
#endif
|
||||
return bRetVal;
|
||||
}
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) ==
|
||||
CSimpleSocket::SocketError)
|
||||
{
|
||||
//--------------------------------------------------------------
|
||||
// Get error value this might be a non-blocking socket so we
|
||||
// must first check.
|
||||
//--------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
if (connect(m_socket, (struct sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) ==
|
||||
CSimpleSocket::SocketError)
|
||||
{
|
||||
//--------------------------------------------------------------
|
||||
// Get error value this might be a non-blocking socket so we
|
||||
// must first check.
|
||||
//--------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
|
||||
//--------------------------------------------------------------
|
||||
// If the socket is non-blocking and the current socket error
|
||||
// is SocketEinprogress or SocketEwouldblock then poll connection
|
||||
// with select for designated timeout period.
|
||||
// Linux returns EINPROGRESS and Windows returns WSAEWOULDBLOCK.
|
||||
//--------------------------------------------------------------
|
||||
if ((IsNonblocking()) &&
|
||||
((GetSocketError() == CSimpleSocket::SocketEwouldblock) ||
|
||||
(GetSocketError() == CSimpleSocket::SocketEinprogress)))
|
||||
{
|
||||
bRetVal = Select(GetConnectTimeoutSec(), GetConnectTimeoutUSec());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
TranslateSocketError();
|
||||
bRetVal = true;
|
||||
}
|
||||
//--------------------------------------------------------------
|
||||
// If the socket is non-blocking and the current socket error
|
||||
// is SocketEinprogress or SocketEwouldblock then poll connection
|
||||
// with select for designated timeout period.
|
||||
// Linux returns EINPROGRESS and Windows returns WSAEWOULDBLOCK.
|
||||
//--------------------------------------------------------------
|
||||
if ((IsNonblocking()) &&
|
||||
((GetSocketError() == CSimpleSocket::SocketEwouldblock) ||
|
||||
(GetSocketError() == CSimpleSocket::SocketEinprogress)))
|
||||
{
|
||||
bRetVal = Select(GetConnectTimeoutSec(), GetConnectTimeoutUSec());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
TranslateSocketError();
|
||||
bRetVal = true;
|
||||
}
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -133,56 +133,56 @@ bool CActiveSocket::ConnectTCP(const char *pAddr, uint16 nPort)
|
||||
//------------------------------------------------------------------------------
|
||||
bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort)
|
||||
{
|
||||
bool bRetVal = false;
|
||||
struct in_addr stIpAddress;
|
||||
bool bRetVal = false;
|
||||
struct in_addr stIpAddress;
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// Pre-connection setup that must be preformed
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
//------------------------------------------------------------------
|
||||
// Pre-connection setup that must be preformed
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
#ifdef WIN32
|
||||
TranslateSocketError();
|
||||
TranslateSocketError();
|
||||
#else
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
#endif
|
||||
return bRetVal;
|
||||
}
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
if (connect(m_socket, (struct sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
|
||||
TranslateSocketError();
|
||||
TranslateSocketError();
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -192,58 +192,57 @@ 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
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
bool bRetVal = false;
|
||||
struct in_addr stIpAddress;
|
||||
//------------------------------------------------------------------
|
||||
// Pre-connection setup that must be preformed
|
||||
//------------------------------------------------------------------
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL)
|
||||
{
|
||||
#ifdef WIN32
|
||||
TranslateSocketError();
|
||||
TranslateSocketError();
|
||||
#else
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
if (h_errno == HOST_NOT_FOUND)
|
||||
{
|
||||
SetSocketError(SocketInvalidAddress);
|
||||
}
|
||||
#endif
|
||||
return bRetVal;
|
||||
}
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
memcpy(&stIpAddress, m_pHE->h_addr_list[0], m_pHE->h_length);
|
||||
m_stServerSockaddr.sin_addr.s_addr = stIpAddress.s_addr;
|
||||
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
if ((int32)m_stServerSockaddr.sin_addr.s_addr == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
//------------------------------------------------------------------
|
||||
// Connect to address "xxx.xxx.xxx.xxx" (IPv4) address only.
|
||||
//
|
||||
//------------------------------------------------------------------
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
if (connect(m_socket, (struct sockaddr*)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
if (connect(m_socket, (struct sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
|
||||
TranslateSocketError();
|
||||
TranslateSocketError();
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//
|
||||
// Open() - Create a connection to a specified address on a specified port
|
||||
@@ -251,60 +250,60 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort)
|
||||
//------------------------------------------------------------------------------
|
||||
bool CActiveSocket::Open(const char *pAddr, uint16 nPort)
|
||||
{
|
||||
bool bRetVal = false;
|
||||
bool bRetVal = false;
|
||||
|
||||
if (IsSocketValid() == false)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidSocket);
|
||||
return bRetVal;
|
||||
}
|
||||
if (IsSocketValid() == false)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidSocket);
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
if (pAddr == NULL)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidAddress);
|
||||
return bRetVal;
|
||||
}
|
||||
if (pAddr == NULL)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidAddress);
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
if (nPort == 0)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidPort);
|
||||
return bRetVal;
|
||||
}
|
||||
if (nPort == 0)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketInvalidPort);
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
switch (m_nSocketType)
|
||||
{
|
||||
case CSimpleSocket::SocketTypeTcp :
|
||||
{
|
||||
bRetVal = ConnectTCP(pAddr, nPort);
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeUdp :
|
||||
{
|
||||
bRetVal = ConnectUDP(pAddr, nPort);
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeRaw :
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch (m_nSocketType)
|
||||
{
|
||||
case CSimpleSocket::SocketTypeTcp:
|
||||
{
|
||||
bRetVal = ConnectTCP(pAddr, nPort);
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeUdp:
|
||||
{
|
||||
bRetVal = ConnectUDP(pAddr, nPort);
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeRaw:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If successful then create a local copy of the address and port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bRetVal)
|
||||
{
|
||||
socklen_t nSockLen = sizeof(struct sockaddr);
|
||||
//--------------------------------------------------------------------------
|
||||
// If successful then create a local copy of the address and port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bRetVal)
|
||||
{
|
||||
socklen_t nSockLen = sizeof(struct sockaddr);
|
||||
|
||||
memset(&m_stServerSockaddr, 0, nSockLen);
|
||||
getpeername(m_socket, (struct sockaddr *)&m_stServerSockaddr, &nSockLen);
|
||||
memset(&m_stServerSockaddr, 0, nSockLen);
|
||||
getpeername(m_socket, (struct sockaddr *)&m_stServerSockaddr, &nSockLen);
|
||||
|
||||
nSockLen = sizeof(struct sockaddr);
|
||||
memset(&m_stClientSockaddr, 0, nSockLen);
|
||||
getsockname(m_socket, (struct sockaddr *)&m_stClientSockaddr, &nSockLen);
|
||||
nSockLen = sizeof(struct sockaddr);
|
||||
memset(&m_stClientSockaddr, 0, nSockLen);
|
||||
getsockname(m_socket, (struct sockaddr *)&m_stClientSockaddr, &nSockLen);
|
||||
|
||||
SetSocketError(SocketSuccess);
|
||||
}
|
||||
SetSocketError(SocketSuccess);
|
||||
}
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user