Merge pull request #604 from Onran0/udp-fix

UDP Fixes

src/logic/scripting/lua/libs/libnetwork.cpp

@@ -1,3 +1,5 @@
+#include <utility>
+
 #include "api_lua.hpp"
 #include "coders/json.hpp"
 #include "engine/Engine.hpp"
@@ -263,8 +265,7 @@ struct NetworkDatagramEvent : NetworkEvent {
     NetworkDatagramSide side;
     std::string addr;
     int port;
-    const char* buffer;
+    std::vector<char> buffer;
-    size_t length;
 
     NetworkDatagramEvent(
         NetworkEventType datagram,
@@ -273,25 +274,25 @@ struct NetworkDatagramEvent : NetworkEvent {
         NetworkDatagramSide side,
         const std::string& addr,
         int port,
-        const char* data,
+        std::vector<char> buffer
-        size_t length
     ) : NetworkEvent(DATAGRAM, sid, cid) {
         this->side = side;
         this->addr = addr;
         this->port = port;
 
-        buffer = data;
+        this->buffer = std::move(buffer);
-
-        this->length = length;
     }
 };
 
 static std::vector<std::unique_ptr<NetworkEvent>> events_queue {};
+static std::mutex events_queue_mutex;
 
 static int l_connect_tcp(lua::State* L, network::Network& network) {
     std::string address = lua::require_string(L, 1);
     int port = lua::tointeger(L, 2);
     u64id_t id = network.connectTcp(address, port, [](u64id_t cid) {
+        std::lock_guard lock(events_queue_mutex);
+
         events_queue.push_back(std::make_unique<NetworkEvent>(CONNECTED_TO_SERVER, 0, cid));
     });
     return lua::pushinteger(L, id);
@@ -300,6 +301,8 @@ static int l_connect_tcp(lua::State* L, network::Network& network) {
 static int l_open_tcp(lua::State* L, network::Network& network) {
     int port = lua::tointeger(L, 1);
     u64id_t id = network.openTcpServer(port, [](u64id_t sid, u64id_t id) {
+        std::lock_guard lock(events_queue_mutex);
+
         events_queue.push_back(std::make_unique<NetworkEvent>(CLIENT_CONNECTED, sid, id));
     });
     return lua::pushinteger(L, id);
@@ -309,16 +312,20 @@ static int l_connect_udp(lua::State* L, network::Network& network) {
     std::string address = lua::require_string(L, 1);
     int port = lua::tointeger(L, 2);
     u64id_t id = network.connectUdp(address, port, [](u64id_t cid) {
+        std::lock_guard lock(events_queue_mutex);
+
         events_queue.push_back(std::make_unique<NetworkEvent>(CONNECTED_TO_SERVER, 0, cid));
     }, [address, port](
         u64id_t cid,
         const char* buffer,
         size_t length
     ) {
+        std::lock_guard lock(events_queue_mutex);
+
         events_queue.push_back(
             std::make_unique<NetworkDatagramEvent>(
                 DATAGRAM, 0, cid, ON_CLIENT,
-                address, port, buffer, length
+                address, port, std::vector(buffer, buffer + length)
             )
         );
     });
@@ -333,10 +340,12 @@ static int l_open_udp(lua::State* L, network::Network& network) {
         int port,
         const char* buffer,
         size_t length) {
+        std::lock_guard lock(events_queue_mutex);
+
         events_queue.push_back(
             std::make_unique<NetworkDatagramEvent>(
                 DATAGRAM, sid, 0, ON_SERVER,
-                addr, port, buffer, length
+                addr, port, std::vector(buffer, buffer + length)
             )
         );
     });
@@ -403,20 +412,27 @@ static int l_get_total_download(lua::State* L, network::Network& network) {
 }
 
 static int l_pull_events(lua::State* L, network::Network& network) {
-    lua::createtable(L, events_queue.size(), 0);
+    std::vector<std::unique_ptr<NetworkEvent>> local_queue;
 
-    for (size_t i = 0; i < events_queue.size(); i++) {
+    {
-        const auto* datagramEvent = dynamic_cast<NetworkDatagramEvent*>(events_queue[i].get());
+        std::lock_guard lock(events_queue_mutex);
+        local_queue.swap(events_queue);
+    }
+
+    lua::createtable(L, local_queue.size(), 0);
+
+    for (size_t i = 0; i < local_queue.size(); i++) {
+        const auto* datagramEvent = dynamic_cast<NetworkDatagramEvent*>(local_queue[i].get());
 
         lua::createtable(L, datagramEvent ? 7 : 3, 0);
 
-        lua::pushinteger(L, events_queue[i]->type);
+        lua::pushinteger(L, local_queue[i]->type);
         lua::rawseti(L, 1);
 
-        lua::pushinteger(L, events_queue[i]->server);
+        lua::pushinteger(L, local_queue[i]->server);
         lua::rawseti(L, 2);
 
-        lua::pushinteger(L, events_queue[i]->client);
+        lua::pushinteger(L, local_queue[i]->client);
         lua::rawseti(L, 3);
 
         if (datagramEvent) {
@@ -429,13 +445,13 @@ static int l_pull_events(lua::State* L, network::Network& network) {
             lua::pushinteger(L, datagramEvent->side);
             lua::rawseti(L, 6);
 
-            lua::create_bytearray(L, datagramEvent->buffer, datagramEvent->length);
+            lua::create_bytearray(L, datagramEvent->buffer.data(), datagramEvent->buffer.size());
             lua::rawseti(L, 7);
         }
         
         lua::rawseti(L, i + 1);
     }
-    events_queue.clear();
+
     return 1;
 }
 

src/network/Network.cpp

@@ -642,19 +642,19 @@ public:
     ) {
         SOCKET descriptor = socket(AF_INET, SOCK_DGRAM, 0);
         if (descriptor == -1) {
-            throw std::runtime_error("could not create UDP socket");
+            throw std::runtime_error("could not create udp socket");
         }
 
         sockaddr_in serverAddr{};
         serverAddr.sin_family = AF_INET;
         if (inet_pton(AF_INET, address.c_str(), &serverAddr.sin_addr) <= 0) {
             closesocket(descriptor);
-            throw std::runtime_error("invalid UDP address: " + address);
+            throw std::runtime_error("invalid udp address: " + address);
         }
         serverAddr.sin_port = htons(port);
 
         if (::connect(descriptor, (sockaddr*)&serverAddr, sizeof(serverAddr)) < 0) {
-            auto err = handle_socket_error("UDP connect failed");
+            auto err = handle_socket_error("udp connect failed");
             closesocket(descriptor);
             throw err;
         }
@@ -810,7 +810,7 @@ public:
         u64id_t id, Network* network, int port, const ServerDatagramCallback& handler
     ) {
         SOCKET descriptor = socket(AF_INET, SOCK_DGRAM, 0);
-        if (descriptor == -1) throw std::runtime_error("Could not create UDP socket");
+        if (descriptor == -1) throw std::runtime_error("could not create udp socket");
 
         sockaddr_in address{};
         address.sin_family = AF_INET;
@@ -819,7 +819,7 @@ public:
 
         if (bind(descriptor, (sockaddr*)&address, sizeof(address)) < 0) {
             closesocket(descriptor);
-            throw std::runtime_error("Could not bind UDP port " + std::to_string(port));
+            throw std::runtime_error("could not bind udp port " + std::to_string(port));
         }
 
         auto server = std::make_shared<SocketUdpServer>(id, network, descriptor, port);