Skip to content
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

Jump to bottom

timeout #8

Merged
merged 10 commits into from
May 26, 2020
Merged

timeout #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32fc2e3
timeout
x44203 May 25, 2020
c17fd51
reformat
x44203 May 26, 2020
7e460ec
reformat
x44203 May 26, 2020
3aee761
fixed header
x44203 May 26, 2020
91a1232
fixed spaces after //
x44203 May 26, 2020
97056d4
fixed indentation
x44203 May 26, 2020
3d14cca
fixed indentation
x44203 May 26, 2020
a3cf10a
fixed indentation with new .clang-format
x44203 May 26, 2020
969a00b
access modifier relocated
x44203 May 26, 2020
77db57b
doxygen fix
x44203 May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
140 changes: 91 additions & 49 deletions Socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include "Socket.h"
#include "../log/log.h"
#include <ctime>
#include <memory.h>

#ifndef _WIN32
Expand All @@ -49,14 +50,11 @@ using namespace std;
@param type Type of the socket (stream or datagram)
@param protocol Protocol of the socket (layer 4 protocol selection)
*/
Socket::Socket(int af, int type, int protocol)
: m_af(af)
, m_type(type)
, m_protocol(protocol)
Socket::Socket(int af, int type, int protocol) : m_af(af), m_type(type), m_protocol(protocol)
{
#ifdef _WIN32
WSADATA wdat;
if(0 != WSAStartup(MAKEWORD(2,2),&wdat))
if(0 != WSAStartup(MAKEWORD(2, 2), &wdat))
LogError("Failed to initialize socket library\n");
#endif

Expand All @@ -78,17 +76,15 @@ void Socket::Open()
@param sock Socket to encapsulate
@param af Address family of the provided socket
*/
Socket::Socket(ZSOCKET sock, int af)
: m_af(af)
, m_socket(sock)
Socket::Socket(ZSOCKET sock, int af) : m_af(af), m_socket(sock)
{
//TODO: get actual values?
m_type = SOCK_STREAM;
m_protocol = IPPROTO_TCP;

#ifdef _WIN32
WSADATA wdat;
if(0 != WSAStartup(MAKEWORD(2,2),&wdat))
if(0 != WSAStartup(MAKEWORD(2, 2), &wdat))
LogFatal("Failed to initialize socket library\n");
#endif
}
Expand All @@ -107,20 +103,20 @@ Socket::~Socket(void)

void Socket::Close()
{
//There are a couple of different ways to close a socket...
#ifdef _WIN32
//There are a couple of different ways to close a socket...
#ifdef _WIN32
if(m_socket != INVALID_SOCKET)
{
closesocket(m_socket);
m_socket = INVALID_SOCKET;
}
#else
#else
if(m_socket >= 0)
{
close(m_socket);
m_socket = -1;
}
#endif
#endif
}

/**
Expand All @@ -135,7 +131,7 @@ bool Socket::Connect(const std::string& host, uint16_t port)
{
addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC; //allow both v4 and v6
hints.ai_family = AF_UNSPEC; //allow both v4 and v6
hints.ai_socktype = m_type;

#ifndef _WIN32
Expand All @@ -148,7 +144,7 @@ bool Socket::Connect(const std::string& host, uint16_t port)

#ifdef _WIN32
//Do a DNS lookup
ADDRINFO* address=NULL;
ADDRINFO* address = NULL;
#else
addrinfo* address = NULL;
#endif
Expand All @@ -158,15 +154,15 @@ bool Socket::Connect(const std::string& host, uint16_t port)
LogWarning("DNS lookup for %s failed\n", host.c_str());
return false;
}
if(address==NULL)
if(address == NULL)
{
LogWarning("DNS lookup for %s failed\n", host.c_str());
return false;
}

//Try actually connecting
bool connected = false;
for(addrinfo* p = address; p != NULL; p=p->ai_next)
for(addrinfo* p = address; p != NULL; p = p->ai_next)
{
m_af = p->ai_family;
m_protocol = p->ai_protocol;
Expand Down Expand Up @@ -210,7 +206,7 @@ bool Socket::SendLooped(const unsigned char* buf, int count)
const unsigned char* p = buf;
int bytes_left = count;
int x = 0;
while( (x = send(m_socket, (const char*)p, bytes_left, 0)) > 0)
while((x = send(m_socket, (const char*)p, bytes_left, 0)) > 0)
{
bytes_left -= x;
p += x;
Expand Down Expand Up @@ -285,10 +281,57 @@ size_t Socket::SendTo(void* buf, size_t len, sockaddr_in& addr, int flags)
*/
bool Socket::RecvLooped(unsigned char* buf, int len)
{
return RecvLooped(buf, len, 2);

/**
unsigned char* p = buf;
int bytes_left = len;
int x = 0;
while( (x = recv(m_socket, (char*)p, bytes_left, 0)) > 0)

while((x = recv(m_socket, (char*)p, bytes_left, 0)) > 0)
{
bytes_left -= x;
p += x;
if(bytes_left == 0)
break;
}

if(x < 0)
{
LogWarning("Socket read failed\n");
return false;
}
else if(x == 0)
{
//LogWarning("Socket closed unexpectedly\n");
return false;
}

return true;
*/
}

/**
@brief Recieves data from the socket with a timeout

@param buf The buffer to read into
@param len Length of read buffer
@param timeout Timeout in seconds

@return true on success, false on fail
*/
bool Socket::RecvLooped(unsigned char* buf, int len, int timeout)
{
unsigned char* p = buf;
int bytes_left = len;
int x = 0;
clock_t start = clock();

struct timeval tv;
tv.tv_sec = timeout;
tv.tv_usec = 0;
setsockopt(m_socket, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
while(((int)(clock() - start) < CLOCKS_PER_SEC * timeout) && (x = recv(m_socket, (char*)p, bytes_left, 0)) > 0)
{
bytes_left -= x;
p += x;
Expand Down Expand Up @@ -328,7 +371,7 @@ bool Socket::Bind(unsigned short port)

if(m_af == AF_INET)
{
memset(&name,0,sizeof(name));
memset(&name, 0, sizeof(name));

//Set port number
name.sin_family = m_af;
Expand All @@ -338,7 +381,7 @@ bool Socket::Bind(unsigned short port)
}
else
{
memset(&name6,0,sizeof(name6));
memset(&name6, 0, sizeof(name6));

//Set port number
name6.sin6_family = m_af;
Expand All @@ -348,7 +391,7 @@ bool Socket::Bind(unsigned short port)
}

//Try binding the socket
if(0 != ::bind (m_socket, addr, len) )
if(0 != ::bind(m_socket, addr, len))
{
LogError("Unable to bind socket\n");
return false;
Expand All @@ -362,13 +405,12 @@ bool Socket::Bind(unsigned short port)
*/
bool Socket::Listen()
{
if(0 != listen(m_socket,SOMAXCONN))
if(0 != listen(m_socket, SOMAXCONN))
{
LogWarning("Can't listen to socket\n");
return false;
}
return true;

}

/**
Expand All @@ -379,21 +421,21 @@ bool Socket::Listen()

@return Socket for the client connection
*/
Socket Socket::Accept(sockaddr_in* addr,ZSOCKLEN len)
Socket Socket::Accept(sockaddr_in* addr, ZSOCKLEN len)
{
ZSOCKET sock = accept(m_socket,reinterpret_cast<sockaddr*>(addr),&len);
ZSOCKET sock = accept(m_socket, reinterpret_cast<sockaddr*>(addr), &len);

//Error check
#ifdef _WIN32
if(sock==INVALID_SOCKET)
if(sock == INVALID_SOCKET)
#else
if(sock<0)
if(sock < 0)
#endif
{
LogError("Failed to accept socket connection (make sure socket is in listening mode)\n");
}

return Socket(sock,m_af);
return Socket(sock, m_af);
}

/**
Expand All @@ -412,21 +454,21 @@ Socket Socket::Accept()

//Error check
#ifdef _WIN32
if(sock==INVALID_SOCKET)
if(sock == INVALID_SOCKET)
#else
if(sock < 0)
#endif
{
LogError("Failed to accept socket connection (make sure socket is in listening mode)\n");

#ifdef _WIN32
return Socket(INVALID_SOCKET, m_af);
#else
return Socket(-1, m_af);
#endif
#ifdef _WIN32
return Socket(INVALID_SOCKET, m_af);
#else
return Socket(-1, m_af);
#endif
}

return Socket(sock,m_af);
return Socket(sock, m_af);
}

/**
Expand All @@ -437,26 +479,26 @@ Socket Socket::Accept()

@return Socket for the client connection
*/
Socket Socket::Accept(sockaddr_in6* addr,ZSOCKLEN len)
Socket Socket::Accept(sockaddr_in6* addr, ZSOCKLEN len)
{
ZSOCKET sock = accept(m_socket,reinterpret_cast<sockaddr*>(addr),&len);
ZSOCKET sock = accept(m_socket, reinterpret_cast<sockaddr*>(addr), &len);

//Error check
#ifdef _WIN32
if(sock==INVALID_SOCKET)
if(sock == INVALID_SOCKET)
#else
if(sock < 0)
#endif
{
LogError("Failed to accept socket connection (make sure socket is in listening mode)\n");
#ifdef _WIN32
return Socket(INVALID_SOCKET, m_af);
#else
return Socket(-1, m_af);
#endif
#ifdef _WIN32
return Socket(INVALID_SOCKET, m_af);
#else
return Socket(-1, m_af);
#endif
}

return Socket(sock,m_af);
return Socket(sock, m_af);
}

/**
Expand Down Expand Up @@ -510,7 +552,7 @@ bool Socket::RecvPascalString(string& str)
uint32_t len;
if(!RecvLooped((unsigned char*)&len, 4))
return false;
int64_t tlen = static_cast<int64_t>(len) + 1; //use larger int to avoid risk of overflow if str len == 4GB
int64_t tlen = static_cast<int64_t>(len) + 1; //use larger int to avoid risk of overflow if str len == 4GB
char* rbuf = new char[tlen];
bool err = RecvLooped((unsigned char*)rbuf, len);
rbuf[len] = 0; //null terminate the string
Expand All @@ -528,7 +570,7 @@ bool Socket::RecvPascalString(string& str)
bool Socket::DisableNagle()
{
int flag = 1;
if(0 != setsockopt((int)m_socket, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag) ))
if(0 != setsockopt((int)m_socket, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(flag)))
return false;

return true;
Expand All @@ -540,7 +582,7 @@ bool Socket::SetRxTimeout(unsigned int microSeconds)
tv.tv_sec = 0;
tv.tv_usec = (suseconds_t)microSeconds;

if(0 != setsockopt((ZSOCKET)m_socket, m_type, SO_RCVTIMEO, &tv, sizeof(tv)))
if(0 != setsockopt((ZSOCKET)m_socket, m_type, SO_RCVTIMEO, &tv, sizeof(tv)))
return false;

return true;
Expand All @@ -551,7 +593,7 @@ bool Socket::SetTxTimeout(unsigned int microSeconds)
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = (suseconds_t)microSeconds;
if(0 != setsockopt((ZSOCKET)m_socket, m_type, SO_SNDTIMEO, &tv, sizeof(tv)))
if(0 != setsockopt((ZSOCKET)m_socket, m_type, SO_SNDTIMEO, &tv, sizeof(tv)))
return false;

return true;
Expand Down