修复 Windows UDP 连接重置导致的崩溃

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(Candy VERSION 6.1.1)
+project(Candy VERSION 6.1.2)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

candy/src/peer/manager.cc

@@ -342,7 +342,9 @@ int PeerManager::initSocket() {
     this->pollThread = std::thread([&]() {
         spdlog::debug("start thread: peer manager poll");
         while (getClient().isRunning()) {
-            poll();
+            if (poll()) {
+                break;
+            }
         }
         getClient().shutdown();
         spdlog::debug("stop thread: peer manager poll");
@@ -516,24 +518,32 @@ void PeerManager::handleRouteMessage(std::string buffer, const SocketAddress &ad
     }
 }
 
-void PeerManager::poll() {
+int PeerManager::poll() {
     using Poco::Net::Socket;
     using Poco::Net::SocketAddress;
 
-    if (this->socket.poll(Poco::Timespan(1, 0), Poco::Net::Socket::SELECT_READ)) {
-        std::string buffer(1500, 0);
-        SocketAddress address;
-        auto size = this->socket.receiveFrom(buffer.data(), buffer.size(), address);
-        if (size > 0) {
-            buffer.resize(size);
-
-            if (this->stun.address == address) {
-                handleStunResponse(buffer);
-            } else if (auto plaintext = decrypt(buffer)) {
-                handleMessage(std::move(*plaintext), address);
+    try {
+        if (this->socket.poll(Poco::Timespan(1, 0), Poco::Net::Socket::SELECT_READ)) {
+            std::string buffer(1500, 0);
+            SocketAddress address;
+            auto size = this->socket.receiveFrom(buffer.data(), buffer.size(), address);
+            if (size > 0) {
+                buffer.resize(size);
+
+                if (this->stun.address == address) {
+                    handleStunResponse(buffer);
+                } else if (auto plaintext = decrypt(buffer)) {
+                    handleMessage(std::move(*plaintext), address);
+                }
             }
         }
+    } catch (Poco::Net::ConnectionResetException &e) {
+        // 忽略 UDP 的连接 Reset, Windows 特有的问题
+    } catch (std::exception &e) {
+        spdlog::warn("peer_manager poll failed: {}", e.what());
+        return -1;
     }
+    return 0;
 }
 
 std::optional<std::string> PeerManager::decrypt(const std::string &ciphertext) {

candy/src/peer/manager.h

@@ -124,7 +124,7 @@ class PeerManager {
     void handleForwardMessage(std::string buffer, const SocketAddress &address);
     void handleDelayMessage(std::string buffer, const SocketAddress &address);
     void handleRouteMessage(std::string buffer, const SocketAddress &address);
-    void poll();
+    int poll();
 
     std::optional<std::string> decrypt(const std::string &ciphertext);
     std::shared_ptr<EVP_CIPHER_CTX> decryptCtx;