From 21cf7372d008d96aeb828f8a7de52c1f1f478f60 Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Sun, 31 Aug 2025 23:15:00 +0800 Subject: [PATCH] 191 --- .github/workflows/dotnet.yml | 12 +++++++++++- gen/index.js | 4 ++-- src/linker.tunnel/transport/TransportTcpPortMap.cs | 2 +- src/linker.tunnel/transport/TransportUdpPortMap.cs | 4 ++-- src/linker/linker.csproj | 2 +- version.txt | 4 ++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e19018f7..62452744 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -37,7 +37,7 @@ jobs: release_name: v1.9.1.${{ steps.date.outputs.today }} draft: false prerelease: false - body: "1. 一些累计更新\r\n2. 服务器转发多节点\r\n3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速\r\n4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议\r\n5. 一些代码优化，修复一些错误，其它一些小改变" + body: "1. 一些累计更新\r\n2. 服务器转发多节点\r\n3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速\r\n4. 新增一个UDP同时打开的打洞协议，优化了一下其它打洞协议\r\n5. 一些代码优化，修复一些错误，其它一些小改变" - name: publish projects run: ./publish.bat "C:\\Android\\android-sdk" - name: upload-win-x86-oss @@ -220,6 +220,16 @@ jobs: asset_path: ./public/publish-zip/linker-linux-musl-arm64.zip asset_name: linker-linux-musl-arm64.zip asset_content_type: application/zip + - name: upload-version-oss + id: upload-version-oss + uses: tvrcgo/oss-action@v0.1.1 + with: + region: oss-cn-shenzhen + key-id: ${{ secrets.ALIYUN_OSS_ID }} + key-secret: ${{ secrets.ALIYUN_OSS_SECRET }} + bucket: ide-qbcode + asset-path: ./public/version.txt + target-path: /downloads/linker/version.txt - name: upload-install-service-oss id: upload-install-service-oss uses: tvrcgo/oss-action@v0.1.1 diff --git a/gen/index.js b/gen/index.js index ed2f61d4..dd008263 100644 --- a/gen/index.js +++ b/gen/index.js @@ -87,7 +87,7 @@ function writeUpload(data, tagName) { }; } - /* + data.jobs.build.steps.push({ name: `upload-version-oss`, id: `upload-version-oss`, @@ -101,7 +101,7 @@ function writeUpload(data, tagName) { 'target-path': `/downloads/linker/version.txt` } }); - */ + data.jobs.build.steps.push({ name: `upload-install-service-oss`, diff --git a/src/linker.tunnel/transport/TransportTcpPortMap.cs b/src/linker.tunnel/transport/TransportTcpPortMap.cs index 3886cc72..2b47bba6 100644 --- a/src/linker.tunnel/transport/TransportTcpPortMap.cs +++ b/src/linker.tunnel/transport/TransportTcpPortMap.cs @@ -302,7 +302,7 @@ namespace linker.tunnel.transport LoggerHelper.Instance.Warning($"{Name} connect to {tunnelTransportInfo.Remote.MachineId}->{tunnelTransportInfo.Remote.MachineName} {string.Join("\r\n", tunnelTransportInfo.RemoteEndPoints.Select(c => c.ToString()))}"); } - List eps = tunnelTransportInfo.RemoteEndPoints.Select(c=>new IPEndPoint(c.Address, tunnelTransportInfo.Remote.PortMapWan)).ToList(); + List eps = tunnelTransportInfo.RemoteEndPoints.Select(c => c.Address).Distinct().Select(c=>new IPEndPoint(c, tunnelTransportInfo.Remote.PortMapWan)).ToList(); foreach (var ep in eps) { diff --git a/src/linker.tunnel/transport/TransportUdpPortMap.cs b/src/linker.tunnel/transport/TransportUdpPortMap.cs index 8281acd7..1f841fc0 100644 --- a/src/linker.tunnel/transport/TransportUdpPortMap.cs +++ b/src/linker.tunnel/transport/TransportUdpPortMap.cs @@ -104,7 +104,7 @@ namespace linker.tunnel.transport IPEndPoint remoteEP = result.RemoteEndPoint as IPEndPoint; Memory memory = bytes.AsMemory(0, result.ReceivedBytes); - + if (memory.Length > flagBytes.Length && memory.Span.Slice(0, flagBytes.Length).SequenceEqual(flagBytes)) { if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) @@ -306,7 +306,7 @@ namespace linker.tunnel.transport LoggerHelper.Instance.Warning($"{Name} connect to {tunnelTransportInfo.Remote.MachineId}->{tunnelTransportInfo.Remote.MachineName} {string.Join("\r\n", tunnelTransportInfo.RemoteEndPoints.Select(c => c.ToString()))}"); } - List eps = tunnelTransportInfo.RemoteEndPoints.Select(c => new IPEndPoint(c.Address, tunnelTransportInfo.Remote.PortMapWan)).ToList(); + List eps = tunnelTransportInfo.RemoteEndPoints.Select(c => c.Address).Distinct().Select(c => new IPEndPoint(c, tunnelTransportInfo.Remote.PortMapWan)).ToList(); foreach (var ep in eps) { diff --git a/src/linker/linker.csproj b/src/linker/linker.csproj index 90f2dac6..bd8e7790 100644 --- a/src/linker/linker.csproj +++ b/src/linker/linker.csproj @@ -23,7 +23,7 @@ 1. 一些累计更新 2. 服务器转发多节点 3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速 -4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议 +4. 新增一个UDP同时打开的打洞协议，优化了一下其它打洞协议 5. 一些代码优化，修复一些错误，其它一些小改变 snltty https://github.com/snltty/linker diff --git a/version.txt b/version.txt index 2be095af..5f71d8d5 100644 --- a/version.txt +++ b/version.txt @@ -1,7 +1,7 @@ v1.9.1 -2025-08-31 22:53:27 +2025-08-31 23:15:00 1. 一些累计更新 2. 服务器转发多节点 3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速 -4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议 +4. 新增一个UDP同时打开的打洞协议，优化了一下其它打洞协议 5. 一些代码优化，修复一些错误，其它一些小改变 \ No newline at end of file