From 4aacd130ab6d5e56eb2298c1e3e02a6f573c0361 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 15 Nov 2024 07:09:55 +0300
Subject: [PATCH] update Socket interface

---
 src/network/Network.cpp   | 8 ++++----
 src/network/Network.hpp   | 2 +-
 test/network/curltest.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/network/Network.cpp b/src/network/Network.cpp
index 2ba72eaf..3e05b1b0 100644
--- a/src/network/Network.cpp
+++ b/src/network/Network.cpp
@@ -102,9 +102,9 @@ static inline int connectsocket(
 }
 
 static inline int recvsocket(
-    int descriptor, char* buf, size_t len, int flags
+    int descriptor, char* buf, size_t len
 ) noexcept {
-    return recv(descriptor, buf, len, flags);
+    return recv(descriptor, buf, len, 0);
 }
 
 static inline int sendsocket(
@@ -146,8 +146,8 @@ public:
         freeaddrinfo(addr);
     }
 
-    int recv(char* buffer, size_t length, bool blocking) override {
-        int len = recvsocket(descriptor, buffer, length, blocking ? MSG_WAITALL : MSG_DONTWAIT);
+    int recv(char* buffer, size_t length) override {
+        int len = recvsocket(descriptor, buffer, length);
         if (len == 0) {
             int err = errno;
             close();
diff --git a/src/network/Network.hpp b/src/network/Network.hpp
index 4b89ae1f..c5475834 100644
--- a/src/network/Network.hpp
+++ b/src/network/Network.hpp
@@ -26,7 +26,7 @@ namespace network {
 
     class Socket {
     public:
-        virtual int recv(char* buffer, size_t length, bool blocking) = 0;
+        virtual int recv(char* buffer, size_t length) = 0;
         virtual int send(const char* buffer, size_t length) = 0;
         virtual void close() = 0;
         virtual bool isOpen() const = 0;
diff --git a/test/network/curltest.cpp b/test/network/curltest.cpp
index 79ab3332..50add51e 100644
--- a/test/network/curltest.cpp
+++ b/test/network/curltest.cpp
@@ -24,7 +24,7 @@ TEST(curltest, curltest) {
         socket->send(string, strlen(string));
         char data[1024];
 
-        int len = socket->recv(data, 1024, true);
+        int len = socket->recv(data, 1024);
         std::cout << len << " " << std::string(data, len) << std::endl;
     }