From 9d4d8def137caed97c1a99903c4620f7746ea43e Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Wed, 25 Jun 2025 16:03:58 +0800 Subject: [PATCH] 185 --- src/linker.messenger.listen/TcpServer.cs | 15 +++++++++++---- .../connection/TunnelConnectionTcp.cs | 1 + version.txt | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/linker.messenger.listen/TcpServer.cs b/src/linker.messenger.listen/TcpServer.cs index d865277b..086b4981 100644 --- a/src/linker.messenger.listen/TcpServer.cs +++ b/src/linker.messenger.listen/TcpServer.cs @@ -1,4 +1,5 @@ -using linker.libs.extends; +using linker.libs; +using linker.libs.extends; using System.Net; using System.Net.Sockets; @@ -39,18 +40,24 @@ namespace linker.messenger.listen try { SocketReceiveFromResult result = await socketUdp.ReceiveFromAsync(buffer, SocketFlags.None, endPoint).ConfigureAwait(false); - if (result.ReceivedBytes == 0) break; + if (result.ReceivedBytes == 0) + { + LoggerHelper.Instance.Error($"udp server recv 0"); + continue; + } IPEndPoint ep = result.RemoteEndPoint as IPEndPoint; try { await resolverTransfer.BeginReceive(socketUdp, ep, buffer.AsMemory(0, result.ReceivedBytes)).ConfigureAwait(false); } - catch (Exception) + catch (Exception ex) { + LoggerHelper.Instance.Error($"udp server recv {ex}"); } } - catch (Exception) + catch (Exception ex) { + LoggerHelper.Instance.Error($"udp server recv {ex}"); break; } } diff --git a/src/linker.tunnel/connection/TunnelConnectionTcp.cs b/src/linker.tunnel/connection/TunnelConnectionTcp.cs index e2d0e947..0d2d025b 100644 --- a/src/linker.tunnel/connection/TunnelConnectionTcp.cs +++ b/src/linker.tunnel/connection/TunnelConnectionTcp.cs @@ -346,6 +346,7 @@ namespace linker.tunnel.connection ReadResult result = await pipe.Reader.ReadAsync(); if (result.IsCompleted && result.Buffer.IsEmpty) { + cancellationTokenSource.Cancel(); break; } diff --git a/version.txt b/version.txt index b67d9da6..aefcf750 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ v1.8.5 -2025-06-25 15:13:09 +2025-06-25 16:03:58 1. 一些累计更新 2. 备用信标服务器 3. 设置默认中继节点