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
@@ -42,89 +42,85 @@
|
||||
*----------------------------------------------------------------------------*/
|
||||
#include "PassiveSocket.h"
|
||||
|
||||
|
||||
|
||||
CPassiveSocket::CPassiveSocket(CSocketType nType) : CSimpleSocket(nType)
|
||||
{
|
||||
}
|
||||
|
||||
bool CPassiveSocket::BindMulticast(const char *pInterface, const char *pGroup, uint16 nPort)
|
||||
{
|
||||
bool bRetVal = false;
|
||||
bool bRetVal = false;
|
||||
#ifdef WIN32
|
||||
ULONG inAddr;
|
||||
ULONG inAddr;
|
||||
#else
|
||||
int32 nReuse;
|
||||
in_addr_t inAddr;
|
||||
int32 nReuse;
|
||||
in_addr_t inAddr;
|
||||
|
||||
nReuse = IPTOS_LOWDELAY;
|
||||
nReuse = IPTOS_LOWDELAY;
|
||||
#endif
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Set the following socket option SO_REUSEADDR. This will allow the file
|
||||
// descriptor to be reused immediately after the socket is closed instead
|
||||
// of setting in a TIMED_WAIT state.
|
||||
//--------------------------------------------------------------------------
|
||||
memset(&m_stMulticastGroup,0,sizeof(m_stMulticastGroup));
|
||||
m_stMulticastGroup.sin_family = AF_INET;
|
||||
m_stMulticastGroup.sin_port = htons(nPort);
|
||||
//--------------------------------------------------------------------------
|
||||
// Set the following socket option SO_REUSEADDR. This will allow the file
|
||||
// descriptor to be reused immediately after the socket is closed instead
|
||||
// of setting in a TIMED_WAIT state.
|
||||
//--------------------------------------------------------------------------
|
||||
memset(&m_stMulticastGroup, 0, sizeof(m_stMulticastGroup));
|
||||
m_stMulticastGroup.sin_family = AF_INET;
|
||||
m_stMulticastGroup.sin_port = htons(nPort);
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If no IP Address (interface ethn) is supplied, or the loop back is
|
||||
// specified then bind to any interface, else bind to specified interface.
|
||||
//--------------------------------------------------------------------------
|
||||
if ((pInterface == NULL) || (!strlen(pInterface)))
|
||||
{
|
||||
m_stMulticastGroup.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((inAddr = inet_addr(pInterface)) != INADDR_NONE)
|
||||
{
|
||||
m_stMulticastGroup.sin_addr.s_addr = inAddr;
|
||||
}
|
||||
}
|
||||
//--------------------------------------------------------------------------
|
||||
// If no IP Address (interface ethn) is supplied, or the loop back is
|
||||
// specified then bind to any interface, else bind to specified interface.
|
||||
//--------------------------------------------------------------------------
|
||||
if ((pInterface == NULL) || (!strlen(pInterface)))
|
||||
{
|
||||
m_stMulticastGroup.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((inAddr = inet_addr(pInterface)) != INADDR_NONE)
|
||||
{
|
||||
m_stMulticastGroup.sin_addr.s_addr = inAddr;
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Bind to the specified port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bind(m_socket, (struct sockaddr *)&m_stMulticastGroup, sizeof(m_stMulticastGroup)) == 0)
|
||||
{
|
||||
//----------------------------------------------------------------------
|
||||
// Join the multicast group
|
||||
//----------------------------------------------------------------------
|
||||
m_stMulticastRequest.imr_multiaddr.s_addr = inet_addr(pGroup);
|
||||
m_stMulticastRequest.imr_interface.s_addr = m_stMulticastGroup.sin_addr.s_addr;
|
||||
//--------------------------------------------------------------------------
|
||||
// Bind to the specified port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bind(m_socket, (struct sockaddr *)&m_stMulticastGroup, sizeof(m_stMulticastGroup)) == 0)
|
||||
{
|
||||
//----------------------------------------------------------------------
|
||||
// Join the multicast group
|
||||
//----------------------------------------------------------------------
|
||||
m_stMulticastRequest.imr_multiaddr.s_addr = inet_addr(pGroup);
|
||||
m_stMulticastRequest.imr_interface.s_addr = m_stMulticastGroup.sin_addr.s_addr;
|
||||
|
||||
if (SETSOCKOPT(m_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
|
||||
(void *)&m_stMulticastRequest,
|
||||
sizeof(m_stMulticastRequest)) == CSimpleSocket::SocketSuccess)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
if (SETSOCKOPT(m_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
|
||||
(void *)&m_stMulticastRequest,
|
||||
sizeof(m_stMulticastRequest)) == CSimpleSocket::SocketSuccess)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
|
||||
m_timer.SetEndTime();
|
||||
}
|
||||
m_timer.SetEndTime();
|
||||
}
|
||||
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If there was a socket error then close the socket to clean out the
|
||||
// connection in the backlog.
|
||||
//--------------------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If there was a socket error then close the socket to clean out the
|
||||
// connection in the backlog.
|
||||
//--------------------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
if (bRetVal == false)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
|
||||
if (bRetVal == false)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//
|
||||
// Listen() -
|
||||
@@ -132,84 +128,83 @@ bool CPassiveSocket::BindMulticast(const char *pInterface, const char *pGroup, u
|
||||
//------------------------------------------------------------------------------
|
||||
bool CPassiveSocket::Listen(const char *pAddr, uint16 nPort, int32 nConnectionBacklog)
|
||||
{
|
||||
bool bRetVal = false;
|
||||
bool bRetVal = false;
|
||||
#ifdef WIN32
|
||||
ULONG inAddr;
|
||||
ULONG inAddr;
|
||||
#else
|
||||
int32 nReuse;
|
||||
in_addr_t inAddr;
|
||||
int32 nReuse;
|
||||
in_addr_t inAddr;
|
||||
|
||||
nReuse = IPTOS_LOWDELAY;
|
||||
nReuse = IPTOS_LOWDELAY;
|
||||
#endif
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Set the following socket option SO_REUSEADDR. This will allow the file
|
||||
// descriptor to be reused immediately after the socket is closed instead
|
||||
// of setting in a TIMED_WAIT state.
|
||||
//--------------------------------------------------------------------------
|
||||
//--------------------------------------------------------------------------
|
||||
// Set the following socket option SO_REUSEADDR. This will allow the file
|
||||
// descriptor to be reused immediately after the socket is closed instead
|
||||
// of setting in a TIMED_WAIT state.
|
||||
//--------------------------------------------------------------------------
|
||||
#ifdef _LINUX
|
||||
SETSOCKOPT(m_socket, SOL_SOCKET, SO_REUSEADDR, (char*)&nReuse, sizeof(int32));
|
||||
SETSOCKOPT(m_socket, IPPROTO_TCP, IP_TOS, &nReuse, sizeof(int32));
|
||||
SETSOCKOPT(m_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&nReuse, sizeof(int32));
|
||||
SETSOCKOPT(m_socket, IPPROTO_TCP, IP_TOS, &nReuse, sizeof(int32));
|
||||
#endif
|
||||
|
||||
memset(&m_stServerSockaddr,0,sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
memset(&m_stServerSockaddr, 0, sizeof(m_stServerSockaddr));
|
||||
m_stServerSockaddr.sin_family = AF_INET;
|
||||
m_stServerSockaddr.sin_port = htons(nPort);
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If no IP Address (interface ethn) is supplied, or the loop back is
|
||||
// specified then bind to any interface, else bind to specified interface.
|
||||
//--------------------------------------------------------------------------
|
||||
if ((pAddr == NULL) || (!strlen(pAddr)))
|
||||
{
|
||||
m_stServerSockaddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((inAddr = inet_addr(pAddr)) != INADDR_NONE)
|
||||
{
|
||||
m_stServerSockaddr.sin_addr.s_addr = inAddr;
|
||||
}
|
||||
}
|
||||
//--------------------------------------------------------------------------
|
||||
// If no IP Address (interface ethn) is supplied, or the loop back is
|
||||
// specified then bind to any interface, else bind to specified interface.
|
||||
//--------------------------------------------------------------------------
|
||||
if ((pAddr == NULL) || (!strlen(pAddr)))
|
||||
{
|
||||
m_stServerSockaddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((inAddr = inet_addr(pAddr)) != INADDR_NONE)
|
||||
{
|
||||
m_stServerSockaddr.sin_addr.s_addr = inAddr;
|
||||
}
|
||||
}
|
||||
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Bind to the specified port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bind(m_socket, (struct sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
if (m_nSocketType == CSimpleSocket::SocketTypeTcp)
|
||||
{
|
||||
if (listen(m_socket, nConnectionBacklog) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
}
|
||||
//--------------------------------------------------------------------------
|
||||
// Bind to the specified port
|
||||
//--------------------------------------------------------------------------
|
||||
if (bind(m_socket, (struct sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr)) != CSimpleSocket::SocketError)
|
||||
{
|
||||
if (m_nSocketType == CSimpleSocket::SocketTypeTcp)
|
||||
{
|
||||
if (listen(m_socket, nConnectionBacklog) != CSimpleSocket::SocketError)
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bRetVal = true;
|
||||
}
|
||||
}
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// If there was a socket error then close the socket to clean out the
|
||||
// connection in the backlog.
|
||||
//--------------------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
//--------------------------------------------------------------------------
|
||||
// If there was a socket error then close the socket to clean out the
|
||||
// connection in the backlog.
|
||||
//--------------------------------------------------------------------------
|
||||
TranslateSocketError();
|
||||
|
||||
if (bRetVal == false)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
if (bRetVal == false)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
|
||||
return bRetVal;
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//
|
||||
// Accept() -
|
||||
@@ -217,73 +212,72 @@ bool CPassiveSocket::Listen(const char *pAddr, uint16 nPort, int32 nConnectionBa
|
||||
//------------------------------------------------------------------------------
|
||||
CActiveSocket *CPassiveSocket::Accept()
|
||||
{
|
||||
uint32 nSockLen;
|
||||
CActiveSocket *pClientSocket = NULL;
|
||||
SOCKET socket = CSimpleSocket::SocketError;
|
||||
uint32 nSockLen;
|
||||
CActiveSocket *pClientSocket = NULL;
|
||||
SOCKET socket = CSimpleSocket::SocketError;
|
||||
|
||||
if (m_nSocketType != CSimpleSocket::SocketTypeTcp)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketProtocolError);
|
||||
return pClientSocket;
|
||||
}
|
||||
if (m_nSocketType != CSimpleSocket::SocketTypeTcp)
|
||||
{
|
||||
SetSocketError(CSimpleSocket::SocketProtocolError);
|
||||
return pClientSocket;
|
||||
}
|
||||
|
||||
pClientSocket = new CActiveSocket();
|
||||
pClientSocket = new CActiveSocket();
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Wait for incoming connection.
|
||||
//--------------------------------------------------------------------------
|
||||
if (pClientSocket != NULL)
|
||||
{
|
||||
CSocketError socketErrno = SocketSuccess;
|
||||
//--------------------------------------------------------------------------
|
||||
// Wait for incoming connection.
|
||||
//--------------------------------------------------------------------------
|
||||
if (pClientSocket != NULL)
|
||||
{
|
||||
CSocketError socketErrno = SocketSuccess;
|
||||
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
nSockLen = sizeof(m_stClientSockaddr);
|
||||
nSockLen = sizeof(m_stClientSockaddr);
|
||||
|
||||
do
|
||||
{
|
||||
errno = 0;
|
||||
socket = accept(m_socket, (struct sockaddr *)&m_stClientSockaddr, (socklen_t *)&nSockLen);
|
||||
do
|
||||
{
|
||||
errno = 0;
|
||||
socket = accept(m_socket, (struct sockaddr *)&m_stClientSockaddr, (socklen_t *)&nSockLen);
|
||||
|
||||
if (socket != -1)
|
||||
{
|
||||
pClientSocket->SetSocketHandle(socket);
|
||||
pClientSocket->TranslateSocketError();
|
||||
socketErrno = pClientSocket->GetSocketError();
|
||||
socklen_t nSockLen = sizeof(struct sockaddr);
|
||||
if (socket != -1)
|
||||
{
|
||||
pClientSocket->SetSocketHandle(socket);
|
||||
pClientSocket->TranslateSocketError();
|
||||
socketErrno = pClientSocket->GetSocketError();
|
||||
socklen_t nSockLen = sizeof(struct sockaddr);
|
||||
|
||||
//-------------------------------------------------------------
|
||||
// Store client and server IP and port information for this
|
||||
// connection.
|
||||
//-------------------------------------------------------------
|
||||
getpeername(m_socket, (struct sockaddr *)&pClientSocket->m_stClientSockaddr, &nSockLen);
|
||||
memcpy((void *)&pClientSocket->m_stClientSockaddr, (void *)&m_stClientSockaddr, nSockLen);
|
||||
//-------------------------------------------------------------
|
||||
// Store client and server IP and port information for this
|
||||
// connection.
|
||||
//-------------------------------------------------------------
|
||||
getpeername(m_socket, (struct sockaddr *)&pClientSocket->m_stClientSockaddr, &nSockLen);
|
||||
memcpy((void *)&pClientSocket->m_stClientSockaddr, (void *)&m_stClientSockaddr, nSockLen);
|
||||
|
||||
memset(&pClientSocket->m_stServerSockaddr, 0, nSockLen);
|
||||
getsockname(m_socket, (struct sockaddr *)&pClientSocket->m_stServerSockaddr, &nSockLen);
|
||||
}
|
||||
else
|
||||
{
|
||||
TranslateSocketError();
|
||||
socketErrno = GetSocketError();
|
||||
}
|
||||
memset(&pClientSocket->m_stServerSockaddr, 0, nSockLen);
|
||||
getsockname(m_socket, (struct sockaddr *)&pClientSocket->m_stServerSockaddr, &nSockLen);
|
||||
}
|
||||
else
|
||||
{
|
||||
TranslateSocketError();
|
||||
socketErrno = GetSocketError();
|
||||
}
|
||||
|
||||
} while (socketErrno == CSimpleSocket::SocketInterrupted);
|
||||
} while (socketErrno == CSimpleSocket::SocketInterrupted);
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
if (socketErrno != CSimpleSocket::SocketSuccess)
|
||||
{
|
||||
delete pClientSocket;
|
||||
pClientSocket = NULL;
|
||||
}
|
||||
}
|
||||
if (socketErrno != CSimpleSocket::SocketSuccess)
|
||||
{
|
||||
delete pClientSocket;
|
||||
pClientSocket = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return pClientSocket;
|
||||
return pClientSocket;
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
//
|
||||
// Send() - Send data on a valid socket
|
||||
@@ -291,41 +285,41 @@ CActiveSocket *CPassiveSocket::Accept()
|
||||
//------------------------------------------------------------------------------
|
||||
int32 CPassiveSocket::Send(const uint8 *pBuf, size_t bytesToSend)
|
||||
{
|
||||
SetSocketError(SocketSuccess);
|
||||
m_nBytesSent = 0;
|
||||
SetSocketError(SocketSuccess);
|
||||
m_nBytesSent = 0;
|
||||
|
||||
switch(m_nSocketType)
|
||||
{
|
||||
case CSimpleSocket::SocketTypeUdp:
|
||||
{
|
||||
if (IsSocketValid())
|
||||
{
|
||||
if ((bytesToSend > 0) && (pBuf != NULL))
|
||||
{
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
switch (m_nSocketType)
|
||||
{
|
||||
case CSimpleSocket::SocketTypeUdp:
|
||||
{
|
||||
if (IsSocketValid())
|
||||
{
|
||||
if ((bytesToSend > 0) && (pBuf != NULL))
|
||||
{
|
||||
m_timer.Initialize();
|
||||
m_timer.SetStartTime();
|
||||
|
||||
m_nBytesSent = SENDTO(m_socket, pBuf, bytesToSend, 0,
|
||||
(const sockaddr *)&m_stClientSockaddr,
|
||||
sizeof(m_stClientSockaddr));
|
||||
m_nBytesSent = SENDTO(m_socket, pBuf, bytesToSend, 0,
|
||||
(const sockaddr *)&m_stClientSockaddr,
|
||||
sizeof(m_stClientSockaddr));
|
||||
|
||||
m_timer.SetEndTime();
|
||||
m_timer.SetEndTime();
|
||||
|
||||
if (m_nBytesSent == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeTcp:
|
||||
CSimpleSocket::Send(pBuf, bytesToSend);
|
||||
break;
|
||||
default:
|
||||
SetSocketError(SocketProtocolError);
|
||||
break;
|
||||
}
|
||||
if (m_nBytesSent == CSimpleSocket::SocketError)
|
||||
{
|
||||
TranslateSocketError();
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CSimpleSocket::SocketTypeTcp:
|
||||
CSimpleSocket::Send(pBuf, bytesToSend);
|
||||
break;
|
||||
default:
|
||||
SetSocketError(SocketProtocolError);
|
||||
break;
|
||||
}
|
||||
|
||||
return m_nBytesSent;
|
||||
return m_nBytesSent;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user