[ADDED] Shutdown the server socket before closing it.

[ADDED] onError functions to handle errors with each method.
[FIXED] Some bugs (#define -> constexprs...)

Works much more stable now.

Author: eminfedar

easysocket/Makefile

@@ -21,14 +21,14 @@ SRCEXT	:= .cpp
 OBJEXT	:= .o
 
 #Compiler and Linker
-BUILD  		?= debug
+BUILD  		?= release
 BITS		?= 64
 CC			:= g++
 
 #Flags, Libraries and Includes
 CFLAGS.common	:= -std=c++17 -fPIC -m$(BITS) -Wall -Wextra -DBUILD_EASYSOCKET
 CFLAGS.debug 	:= $(CFLAGS.common) -g
-CFLAGS.release	:= $(CFLAGS.common) -Werror
+CFLAGS.release	:= $(CFLAGS.common) -Werror -O3
 CFLAGS			?= $(CFLAGS.$(BUILD))
 LIB		:= -L$(TARGETDIR)
 INC		:= -I$(INCDIR)

easysocket/include/tcpserver.h

@@ -12,7 +12,7 @@ class EASYSOCKET_API TCPServer : public BaseSocket
 {
 public:
     // Event Listeners:
-    std::function<void(TCPSocket *)> onNewConnection;
+    std::function<void(TCPSocket *)> onNewConnection = [](TCPSocket* sock){FDR_UNUSED(sock)};
 
     TCPServer(FDR_ON_ERROR);
 
@@ -23,6 +23,9 @@ class EASYSOCKET_API TCPServer : public BaseSocket
     // Start listening the server.
     void Listen(FDR_ON_ERROR);
 
+    // Overriding Close to add shutdown():
+    void Close();
+
 private:
     static void Accept(TCPServer *server, FDR_ON_ERROR);
 };

easysocket/include/tcpsocket.h

@@ -8,22 +8,22 @@
 #include <functional>
 #include <thread>
 
-#define BUFFER_SIZE 0xFFFF
+constexpr uint16_t BUFFER_SIZE = 0xFFFF;
 
 class EASYSOCKET_API TCPSocket : public BaseSocket
 {
 public:
     // Event Listeners:
-    std::function<void(std::string)> onMessageReceived;
-    std::function<void()> onSocketClosed;
+    std::function<void(std::string)> onMessageReceived = [](std::string msg) { FDR_UNUSED(msg) };
+    std::function<void()> onSocketClosed = [](){};
 
     TCPSocket(FDR_ON_ERROR, int socketId = -1);
 
     int Send(std::string message);
     int Send(const char *bytes, size_t byteslength);
 
-    void Connect(std::string ipv4, uint16_t port, std::function<void()> onConnected = []{}, FDR_ON_ERROR);
-    void Connect(uint32_t IPv4, uint16_t port, std::function<void()> onConnected = []{}, FDR_ON_ERROR);
+    void Connect(std::string ipv4, uint16_t port, std::function<void()> onConnected = [](){}, FDR_ON_ERROR);
+    void Connect(uint32_t IPv4, uint16_t port, std::function<void()> onConnected = [](){}, FDR_ON_ERROR);
 
     void Listen();
 

easysocket/include/udpserver.h

@@ -12,7 +12,7 @@ class EASYSOCKET_API UDPServer : public UDPSocket
     UDPServer();
 
     void Bind(int port, FDR_ON_ERROR);
-    void Bind(const char *address, std::uint16_t port, FDR_ON_ERROR);
+    void Bind(std::string IPv4, std::uint16_t port, FDR_ON_ERROR);
 };
 
 #endif

easysocket/include/udpsocket.h

@@ -8,7 +8,7 @@
 #include <functional>
 #include <thread>
 
-#define BUFFER_SIZE 0xFFFF
+constexpr uint16_t BUFFER_SIZE = 0xFFFF;
 
 class EASYSOCKET_API UDPSocket : public BaseSocket
 {

easysocket/src/basesocket.cpp

@@ -21,8 +21,10 @@ BaseSocket::BaseSocket(std::function<void(int, std::string)> onError, SocketType
 
 void BaseSocket::Close()
 {
+    if(isClosed) return;
+
     isClosed = true;
-    close(this->sock);
+    close(this->sock);    
 }
 
 std::string BaseSocket::remoteAddress()

easysocket/src/tcpserver.cpp

@@ -2,15 +2,17 @@
 
 TCPServer::TCPServer(std::function<void(int, std::string)> onError) : BaseSocket(onError, TCP)
 {
-
+    int opt = 1;
+    setsockopt(this->sock,SOL_SOCKET,SO_REUSEADDR,&opt,sizeof(int));
+    setsockopt(this->sock,SOL_SOCKET,SO_REUSEPORT,&opt,sizeof(int));
 }
 
 void TCPServer::Bind(int port, std::function<void(int, std::string)> onError)
 {
     this->Bind("0.0.0.0", port, onError);
 }
 
-void TCPServer::Bind(const char* address, uint16_t port, std::function<void(int, std::string)> onError)
+void TCPServer::Bind(const char *address, uint16_t port, std::function<void(int, std::string)> onError)
 {
     if (inet_pton(AF_INET, address, &this->address.sin_addr) <= 0)
     {
@@ -40,24 +42,36 @@ void TCPServer::Listen(std::function<void(int, std::string)> onError)
     acceptThread.detach();
 }
 
+void TCPServer::Close()
+{
+    shutdown(this->sock, SHUT_RDWR);
+    
+    BaseSocket::Close();
+}
+
 void TCPServer::Accept(TCPServer *server, std::function<void(int, std::string)> onError)
 {
     sockaddr_in newSocketInfo;
     socklen_t newSocketInfoLength = sizeof(newSocketInfo);
 
     int newSock;
-    while (true)
+    while (!server->isClosed)
     {
-        if ((newSock = accept(server->sock, (sockaddr *)&newSocketInfo, &newSocketInfoLength)) < 0)
+        while ((newSock = accept(server->sock, (sockaddr *)&newSocketInfo, &newSocketInfoLength)) < 0)
         {
+            if (errno == EBADF || errno == EINVAL) return;
+
             onError(errno, "Error while accepting a new connection.");
             return;
         }
 
-        TCPSocket *newSocket = new TCPSocket([](int e, std::string er){}, newSock);
-        newSocket->setAddressStruct(newSocketInfo);
+        if (!server->isClosed && newSock >= 0)
+        {
+            TCPSocket *newSocket = new TCPSocket([](int e, std::string er) { FDR_UNUSED(e); FDR_UNUSED(er); }, newSock);
+            newSocket->setAddressStruct(newSocketInfo);
 
-        server->onNewConnection(newSocket);
-        newSocket->Listen();
+            server->onNewConnection(newSocket);
+            newSocket->Listen();
+        }
     }
 }

easysocket/src/tcpsocket.cpp

@@ -1,22 +1,17 @@
 #include <tcpsocket.h>
-#include <iostream>
-
 TCPSocket::TCPSocket(std::function<void(int, std::string)> onError, int socketId) : BaseSocket(onError, TCP, socketId)
 {
-
 }
 
 int TCPSocket::Send(std::string message)
 {
     return this->Send(message.c_str(), message.length());
 }
 
-int TCPSocket::Send(const char* bytes, size_t byteslength)
+int TCPSocket::Send(const char *bytes, size_t byteslength)
 {
     if (this->isClosed)
-    {
         return -1;
-    }
 
     int sent = 0;
     if ((sent = send(this->sock, bytes, byteslength, 0)) < 0)
@@ -26,7 +21,7 @@ int TCPSocket::Send(const char* bytes, size_t byteslength)
     return sent;
 }
 
-void TCPSocket::Connect( std::string ipv4, uint16_t port, std::function<void()> onConnected, std::function<void(int, std::string)> onError)
+void TCPSocket::Connect(std::string ipv4, uint16_t port, std::function<void()> onConnected, std::function<void(int, std::string)> onError)
 {
     if (inet_pton(AF_INET, ipv4.c_str(), &this->address.sin_addr) <= 0)
     {
@@ -38,8 +33,7 @@ void TCPSocket::Connect( std::string ipv4, uint16_t port, std::function<void()>
     this->Connect((uint32_t)this->address.sin_addr.s_addr, port, onConnected, onError);
 }
 
-
-void TCPSocket::Connect( uint32_t IPv4, uint16_t port, std::function<void()> onConnected, std::function<void(int, std::string)> onError)
+void TCPSocket::Connect(uint32_t IPv4, uint16_t port, std::function<void()> onConnected, std::function<void(int, std::string)> onError)
 {
     this->address.sin_family = AF_INET;
     this->address.sin_port = htons(port);
@@ -75,25 +69,12 @@ void TCPSocket::Receive(TCPSocket *socket)
 {
     char tempBuffer[BUFFER_SIZE];
     int messageLength;
-    while ((messageLength = recv(socket->sock, tempBuffer, BUFFER_SIZE, 0)) >= 0)
-    {
-        if (messageLength > 0)
-        {
-            if (socket->onMessageReceived)
-                socket->onMessageReceived(std::string(tempBuffer).substr(0, messageLength));
-        }
-        else
-        {
-            socket->Close();
-            if (socket->onSocketClosed)
-                socket->onSocketClosed();
-        }
-    }
 
-    // If socket crashed:
-    if (!socket->isClosed)
+    while ((messageLength = recv(socket->sock, tempBuffer, BUFFER_SIZE, 0)) > 0)
     {
-        std::cerr << "Socket closed with error." << std::endl;
-        perror("recv");
+        socket->onMessageReceived(std::string(tempBuffer).substr(0, messageLength));
     }
+
+    socket->Close();
+    socket->onSocketClosed();
 }

easysocket/src/udpserver.cpp

@@ -8,9 +8,9 @@ void UDPServer::Bind(int port, std::function<void(int, std::string)> onError) {
     this->Bind("0.0.0.0", port, onError);
 }
 
-void UDPServer::Bind(const char* address, std::uint16_t port, std::function<void(int, std::string)> onError)
+void UDPServer::Bind(std::string IPv4, std::uint16_t port, std::function<void(int, std::string)> onError)
 {
-    if (inet_pton(AF_INET, address, &this->address.sin_addr) <= 0)
+    if (inet_pton(AF_INET, IPv4.c_str(), &this->address.sin_addr) <= 0)
     {
         onError(errno, "Invalid address. Address type not supported.");
         return;