Merge branch 'main' into release-0.25

MihailRis · Dec 4, 2024 · f0a07cb · f0a07cb
2 parents f7903c1 + 5c40cf3
commit f0a07cb
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -62,6 +62,12 @@ If you use Wayland
 sudo pacman -S glfw-wayland glew glm libpng libvorbis openal luajit libcurl
 ```
 
+And you need entt. In yay you can use
+
+```sh
+yay -S entt
+```
+
 ### Build engine with CMake
 
 ```sh

diff --git a/src/network/Network.cpp b/src/network/Network.cpp
@@ -293,37 +293,46 @@ class SocketConnection : public Connection {
         }
     }
 
+    void startListen() {
+        while (state == ConnectionState::CONNECTED) {
+            int size = recvsocket(descriptor, buffer.data(), buffer.size());
+            if (size == 0) {
+                logger.info() << "closed connection with " << to_string(addr);
+                closesocket(descriptor);
+                state = ConnectionState::CLOSED;
+                break;
+            } else if (size < 0) {
+                logger.warning() << "an error ocurred while receiving from "
+                            << to_string(addr);
+                auto error = handle_socket_error("recv(...) error");
+                closesocket(descriptor);
+                state = ConnectionState::CLOSED;
+                logger.error() << error.what();
+                break;
+            }
+            {
+                std::lock_guard lock(mutex);
+                for (size_t i = 0; i < size; i++) {
+                    readBatch.emplace_back(buffer[i]);
+                }
+                totalDownload += size;
+            }
+            logger.debug() << "read " << size << " bytes from " << to_string(addr);
+        }
+    }
+
+    void startClient() {
+        state = ConnectionState::CONNECTED;
+        thread = std::make_unique<std::thread>([this]() { startListen();});
+    }
+
     void connect(runnable callback) override {
         thread = std::make_unique<std::thread>([this, callback]() {
             connectSocket();
             if (state == ConnectionState::CONNECTED) {
                 callback();
             }
-            while (state == ConnectionState::CONNECTED) {
-                int size = recvsocket(descriptor, buffer.data(), buffer.size());
-                if (size == 0) {
-                    logger.info() << "closed connection with " << to_string(addr);
-                    closesocket(descriptor);
-                    state = ConnectionState::CLOSED;
-                    break;
-                } else if (size < 0) {
-                    logger.info() << "an error ocurred while receiving from "
-                                  << to_string(addr);
-                    auto error = handle_socket_error("recv(...) error");
-                    closesocket(descriptor);
-                    state = ConnectionState::CLOSED;
-                    logger.error() << error.what();
-                    break;
-                }
-                {
-                    std::lock_guard lock(mutex);
-                    for (size_t i = 0; i < size; i++) {
-                        readBatch.emplace_back(buffer[i]);
-                    }
-                    totalDownload += size;
-                }
-                logger.info() << "read " << size << " bytes from " << to_string(addr);
-            }
+            startListen();
         });
     }
 
@@ -459,6 +468,7 @@ class SocketTcpSServer : public TcpServer {
                 auto socket = std::make_shared<SocketConnection>(
                     clientDescriptor, address
                 );
+                socket->startClient();
                 u64id_t id = network->addConnection(socket);
                 {
                     std::lock_guard lock(clientsMutex);