Update to v3.0

Fixed potential data races #25
Fixed BUFFER_SIZE bugs #27
Added new Send() function usages
Removed unnecessary string copies (converted to const std::string&)

.gitignore

@@ -31,8 +31,10 @@
 *.out
 *.app
 
-examples/bin
-benchmarks/easysocket/bin
+examples/tcp-client
+examples/tcp-server
+examples/udp-client
+examples/udp-server
 .vscode
 .idea
 cmake-build-debug

async-sockets/include/basesocket.hpp

@@ -13,6 +13,7 @@
 #include <string>
 #include <functional>
 #include <cerrno>
+#include <atomic>
 
 #define FDR_UNUSED(expr){ (void)(expr); } 
 #define FDR_ON_ERROR std::function<void(int, std::string)> onError = [](int errorCode, std::string errorMessage){FDR_UNUSED(errorCode); FDR_UNUSED(errorMessage)}
@@ -26,9 +27,9 @@ class BaseSocket
         TCP = SOCK_STREAM,
         UDP = SOCK_DGRAM
     };
-    const uint16_t BUFFER_SIZE = 0xFFFF;
     sockaddr_in address;
-    bool isClosed = false;
+    std::atomic<bool> isClosed{false};
+    constexpr static uint16_t BUFFER_SIZE = 0x1000; // 4096 bytes
 
 protected:
     int sock = 0;

async-sockets/include/tcpserver.hpp

@@ -7,7 +7,7 @@ class TCPServer : public BaseSocket
 {
 public:
     // Event Listeners:
-    std::function<void(TCPSocket *)> onNewConnection = [](TCPSocket* sock){FDR_UNUSED(sock)};
+    std::function<void(TCPSocket*)> onNewConnection = [](TCPSocket* sock){FDR_UNUSED(sock)};
 
     explicit TCPServer(FDR_ON_ERROR): BaseSocket(onError, SocketType::TCP)
     {
@@ -17,7 +17,7 @@ class TCPServer : public BaseSocket
     }
 
     // Binding the server.
-    void Bind(const char *address, uint16_t port, FDR_ON_ERROR)
+    void Bind(const char* address, uint16_t port, FDR_ON_ERROR)
     {
         if (inet_pton(AF_INET, address, &this->address.sin_addr) <= 0)
         {
@@ -28,7 +28,7 @@ class TCPServer : public BaseSocket
         this->address.sin_family = AF_INET;
         this->address.sin_port = htons(port);
 
-        if (bind(this->sock, (const sockaddr *)&this->address, sizeof(this->address)) < 0)
+        if (bind(this->sock, (const sockaddr*)&this->address, sizeof(this->address)) < 0)
         {
             onError(errno, "Cannot bind the socket.");
             return;
@@ -58,15 +58,15 @@ class TCPServer : public BaseSocket
     }
 
 private:
-    static void Accept(TCPServer *server, FDR_ON_ERROR)
+    static void Accept(TCPServer* server, FDR_ON_ERROR)
     {
         sockaddr_in newSocketInfo;
         socklen_t newSocketInfoLength = sizeof(newSocketInfo);
 
-        int newSock;
+        int newSock = -1;
         while (!server->isClosed)
         {
-            while ((newSock = accept(server->sock, (sockaddr *)&newSocketInfo, &newSocketInfoLength)) < 0)
+            if ((newSock = accept(server->sock, (sockaddr*)&newSocketInfo, &newSocketInfoLength)) < 0)
             {
                 if (errno == EBADF || errno == EINVAL) return;
 
@@ -76,7 +76,7 @@ class TCPServer : public BaseSocket
 
             if (!server->isClosed && newSock >= 0)
             {
-                TCPSocket *newSocket = new TCPSocket(onError, newSock);
+                TCPSocket* newSocket = new TCPSocket(onError, newSock);
                 newSocket->deleteAfterClosed = true;
                 newSocket->setAddressStruct(newSocketInfo);
 

async-sockets/include/tcpsocket.hpp

@@ -17,7 +17,7 @@ class TCPSocket : public BaseSocket
     explicit TCPSocket(FDR_ON_ERROR, int socketId = -1) : BaseSocket(onError, TCP, socketId){}
 
     // Send TCP Packages
-    int Send(const char *bytes, size_t byteslength)
+    int Send(const char* bytes, size_t byteslength)
     {
         if (this->isClosed)
             return -1;
@@ -29,9 +29,9 @@ class TCPSocket : public BaseSocket
         }
         return sent;
     }
-    int Send(std::string message) { return this->Send(message.c_str(), message.length()); }
+    int Send(const std::string& message) { return this->Send(message.c_str(), message.length()); }
 
-    void Connect(std::string host, uint16_t port, std::function<void()> onConnected = [](){}, FDR_ON_ERROR)
+    void Connect(const char* host, uint16_t port, std::function<void()> onConnected = [](){}, FDR_ON_ERROR)
     {
         struct addrinfo hints, *res, *it;
         memset(&hints, 0, sizeof(hints));
@@ -40,7 +40,7 @@ class TCPSocket : public BaseSocket
 
         // Get address info from DNS
         int status;
-        if ((status = getaddrinfo(host.c_str(), NULL, &hints, &res)) != 0) {
+        if ((status = getaddrinfo(host, NULL, &hints, &res)) != 0) {
             onError(errno, "Invalid address." + std::string(gai_strerror(status)));
             return;
         }
@@ -66,7 +66,7 @@ class TCPSocket : public BaseSocket
         this->setTimeout(5);
 
         // Try to connect.
-        if (connect(this->sock, (const sockaddr *)&this->address, sizeof(sockaddr_in)) < 0)
+        if (connect(this->sock, (const sockaddr*)&this->address, sizeof(sockaddr_in)) < 0)
         {
             onError(errno, "Connection failed to the host.");
             this->setTimeout(0);
@@ -94,12 +94,12 @@ class TCPSocket : public BaseSocket
     bool deleteAfterClosed = false;
 
 private:
-    static void Receive(TCPSocket *socket)
+    static void Receive(TCPSocket* socket)
     {
-        char tempBuffer[socket->BUFFER_SIZE];
+        char tempBuffer[TCPSocket::BUFFER_SIZE];
         int messageLength;
 
-        while ((messageLength = recv(socket->sock, tempBuffer, socket->BUFFER_SIZE, 0)) > 0)
+        while ((messageLength = recv(socket->sock, tempBuffer, TCPSocket::BUFFER_SIZE, 0)) > 0)
         {
             tempBuffer[messageLength] = '\0';
             if(socket->onMessageReceived)
@@ -123,7 +123,7 @@ class TCPSocket : public BaseSocket
         tv.tv_sec = seconds;
         tv.tv_usec = 0;
 
-        setsockopt(this->sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
-        setsockopt(this->sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
+        setsockopt(this->sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&tv, sizeof(tv));
+        setsockopt(this->sock, SOL_SOCKET, SO_SNDTIMEO, (char*)&tv, sizeof(tv));
     }
 };

async-sockets/include/udpserver.hpp

@@ -6,9 +6,9 @@
 class UDPServer : public UDPSocket
 {
 public:
-    void Bind(std::string IPv4, std::uint16_t port, FDR_ON_ERROR)
+    void Bind(const char* IPv4, std::uint16_t port, FDR_ON_ERROR)
     {
-        if (inet_pton(AF_INET, IPv4.c_str(), &this->address.sin_addr) <= 0)
+        if (inet_pton(AF_INET, IPv4, &this->address.sin_addr) <= 0)
         {
             onError(errno, "Invalid address. Address type not supported.");
             return;
@@ -17,7 +17,7 @@ class UDPServer : public UDPSocket
         this->address.sin_family = AF_INET;
         this->address.sin_port = htons(port);
 
-        if (bind(this->sock, (const sockaddr *)&this->address, sizeof(this->address)) < 0)
+        if (bind(this->sock, (const sockaddr*)&this->address, sizeof(this->address)) < 0)
         {
             onError(errno, "Cannot bind the socket.");
             return;

async-sockets/include/udpsocket.hpp

@@ -26,7 +26,7 @@ class UDPSocket : public BaseSocket
     }
 
     // SendTo with no connection
-    void SendTo(const char *bytes, size_t byteslength, std::string host, uint16_t port, FDR_ON_ERROR)
+    void SendTo(const char* bytes, size_t byteslength, const char* host, uint16_t port, FDR_ON_ERROR)
     {
         sockaddr_in hostAddr;
 
@@ -36,7 +36,7 @@ class UDPSocket : public BaseSocket
         hints.ai_socktype = SOCK_DGRAM;
 
         int status;
-        if ((status = getaddrinfo(host.c_str(), NULL, &hints, &res)) != 0)
+        if ((status = getaddrinfo(host, NULL, &hints, &res)) != 0)
         {
             onError(errno, "Invalid address." + std::string(gai_strerror(status)));
             return;
@@ -46,7 +46,7 @@ class UDPSocket : public BaseSocket
         {
             if (it->ai_family == AF_INET)
             { // IPv4
-                memcpy((void *)(&hostAddr), (void *)it->ai_addr, sizeof(sockaddr_in));
+                memcpy((void* )(&hostAddr), (void* )it->ai_addr, sizeof(sockaddr_in));
                 break; // for now, just get first ip (ipv4).
             }
         }
@@ -56,19 +56,27 @@ class UDPSocket : public BaseSocket
         hostAddr.sin_port = htons(port);
         hostAddr.sin_family = AF_INET;
 
-        if (sendto(this->sock, bytes, byteslength, 0, (sockaddr *)&hostAddr, sizeof(hostAddr)) < 0)
+        if (sendto(this->sock, bytes, byteslength, 0, (sockaddr*)&hostAddr, sizeof(hostAddr)) < 0)
         {
             onError(errno, "Cannot send message to the address.");
             return;
         }
     }
-    void SendTo(std::string message, std::string host, uint16_t port, FDR_ON_ERROR)
+    void SendTo(const char* bytes, size_t byteslength, const std::string& host, uint16_t port, FDR_ON_ERROR)
+    {
+        this->SendTo(bytes, byteslength, host.c_str(), port, onError);
+    }
+    void SendTo(const std::string& message, const char* host, uint16_t port, FDR_ON_ERROR)
     {
         this->SendTo(message.c_str(), message.length(), host, port, onError);
     }
+    void SendTo(const std::string& message, const std::string& host, uint16_t port, FDR_ON_ERROR)
+    {
+        this->SendTo(message.c_str(), message.length(), host.c_str(), port, onError);
+    }
 
     // Send with Connect()
-    int Send(const char *bytes, size_t byteslength)
+    int Send(const char* bytes, size_t byteslength)
     {
         if (this->isClosed)
         return -1;
@@ -80,7 +88,7 @@ class UDPSocket : public BaseSocket
         }
         return sent;
     }
-    int Send(std::string message)
+    int Send(const std::string& message)
     {
         return this->Send(message.c_str(), message.length());
     }
@@ -93,21 +101,21 @@ class UDPSocket : public BaseSocket
         this->address.sin_addr.s_addr = ipv4;
 
         // Try to connect.
-        if (connect(this->sock, (const sockaddr *)&this->address, sizeof(sockaddr_in)) < 0)
+        if (connect(this->sock, (const sockaddr* )&this->address, sizeof(sockaddr_in)) < 0)
         {
             onError(errno, "Connection failed to the host.");
             return;
         }
     }
-    void Connect(std::string host, uint16_t port, FDR_ON_ERROR)
+    void Connect(const char* host, uint16_t port, FDR_ON_ERROR)
     {
         struct addrinfo hints, *res, *it;
         memset(&hints, 0, sizeof(hints));
         hints.ai_family = AF_INET;
         hints.ai_socktype = SOCK_DGRAM;
 
         int status;
-        if ((status = getaddrinfo(host.c_str(), NULL, &hints, &res)) != 0)
+        if ((status = getaddrinfo(host, NULL, &hints, &res)) != 0)
         {
             onError(errno, "Invalid address." + std::string(gai_strerror(status)));
             return;
@@ -117,7 +125,7 @@ class UDPSocket : public BaseSocket
         {
             if (it->ai_family == AF_INET)
             { // IPv4
-                memcpy((void *)(&this->address), (void *)it->ai_addr, sizeof(sockaddr_in));
+                memcpy((void* )(&this->address), (void*)it->ai_addr, sizeof(sockaddr_in));
                 break; // for now, just get first ip (ipv4).
             }
         }
@@ -128,14 +136,14 @@ class UDPSocket : public BaseSocket
     }
 
 private:
-    static void Receive(UDPSocket *udpSocket)
+    static void Receive(UDPSocket* udpSocket)
     {
-        char tempBuffer[udpSocket->BUFFER_SIZE];
+        char tempBuffer[UDPSocket::BUFFER_SIZE];
 
         while (true)
         {
             int messageLength;
-            messageLength = recv(udpSocket->sock, tempBuffer, udpSocket->BUFFER_SIZE, 0);
+            messageLength = recv(udpSocket->sock, tempBuffer, UDPSocket::BUFFER_SIZE, 0);
 
             if (messageLength < 0)
             {
@@ -153,17 +161,17 @@ class UDPSocket : public BaseSocket
             }
         }
     }
-    static void ReceiveFrom(UDPSocket *udpSocket)
+    static void ReceiveFrom(UDPSocket* udpSocket)
     {
         sockaddr_in hostAddr;
         socklen_t hostAddrSize = sizeof(hostAddr);
 
-        char tempBuffer[udpSocket->BUFFER_SIZE];
+        char tempBuffer[UDPSocket::BUFFER_SIZE];
 
         while (true)
         {
             int messageLength;
-            messageLength = recvfrom(udpSocket->sock, tempBuffer, udpSocket->BUFFER_SIZE, 0, (sockaddr *)&hostAddr, &hostAddrSize);
+            messageLength = recvfrom(udpSocket->sock, tempBuffer, UDPSocket::BUFFER_SIZE, 0, (sockaddr* )&hostAddr, &hostAddrSize);
 
             if (messageLength < 0)
             {

examples/tcp-client.cpp

@@ -38,8 +38,7 @@ int main()
         cout << errorCode << " : " << errorMessage << endl;
     });
 
-    // You should do an input loop so the program will not end immediately:
-    // Because socket listenings are non-blocking.
+    // You should do an input loop, so the program won't terminate immediately
     string input;
     getline(cin, input);
     while (input != "exit")

examples/tcp-server.cpp

@@ -44,7 +44,7 @@ int main()
         cout << errorCode << " : " << errorMessage << endl;
     });
 
-    // You should do an input loop so the program will not terminated immediately:
+    // You should do an input loop, so the program won't terminate immediately
     string input;
     getline(cin, input);
     while (input != "exit")

examples/udp-client.cpp

@@ -6,8 +6,8 @@ using namespace std;
 int main()
 {
     // Our constants:
-    const string IP = "localhost";
-    const uint16_t PORT = 8888;
+    constexpr const char* IP = "localhost";
+    constexpr uint16_t PORT = 8888;
 
     // Initialize socket.
     UDPSocket udpSocket(true); // "true" to use Connection on UDP. Default is "false".
@@ -28,7 +28,7 @@ int main()
     };
     */
 
-    // You should do an input loop so the program will not terminated immediately:
+    // You should do an input loop, so the program won't terminate immediately
     string input;
     getline(cin, input);
     while (input != "exit")

examples/udp-server.cpp

@@ -12,16 +12,15 @@ int main()
     /*udpServer.onMessageReceived = [&](string message, string ipv4, uint16_t port) {
         //cout << ipv4 << ":" << port << " => " << message << endl;
 
-        // Just send without control:
+        // Echo to client:
         udpServer.SendTo("A!", ipv4, port);
     };*/
 
     // If you want to use raw byte arrays:
-
     udpServer.onRawMessageReceived = [&](const char* message, int length, string ipv4, uint16_t port) {
-        //cout << ipv4 << ":" << port << " => " << message << "(" << length << ")" << endl;
+        cout << ipv4 << ":" << port << " => " << message << "(" << length << ")" << endl;
 
-        // Just send without control:
+        // Echo to client:
         udpServer.SendTo(message, length, ipv4, port);
     };
 
@@ -32,7 +31,7 @@ int main()
         cout << errorCode << " : " << errorMessage << endl;
     });
 
-    // You should do an input loop so the program will not terminated immediately:
+    // You should do an input loop, so the program won't terminate immediately
     string input;
     getline(cin, input);
     while (input != "exit")