apps/linker
1
0
Fork 0
mirror of https://github.com/snltty/linker.git synced 2025-09-26 13:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

191

Browse Source
This commit is contained in:
snltty
2025-08-31 14:36:54 +08:00
parent 155efd440e
commit 67310c0c44
12 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dotnet.yml vendored
View File

@@ -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. 一些代码优化、修复一些错误\r\n5. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议\r\n6. 其它一些小改变"
body: "1. 一些累计更新\r\n2. 服务器转发多节点\r\n3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速\r\n4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议\r\n5. 一些代码优化，修复一些错误，其它一些小改变"
- name: publish projects
run: ./publish.bat "C:\\Android\\android-sdk"
- name: upload-win-x86-oss

2
src/linker.messenger.relay/client/transport/RelayClientTransportSelfHost.cs
View File

@@ -618,7 +618,7 @@ namespace linker.messenger.relay.client.transport
MessageResponeInfo resp = await messengerSender.SendReply(new MessageRequestWrap
{
Connection = signInClientState.Connection,
MessengerId = (ushort)RelayMessengerIds.RelayTest170,
MessengerId = (ushort)RelayMessengerIds.RelayTest188,
Payload = serializer.Serialize(relayTestInfo),
Timeout = 2000
}).ConfigureAwait(false);

25
src/linker.messenger.relay/messenger/RelayMessenger.cs
View File

@@ -234,18 +234,30 @@ namespace linker.messenger.relay.messenger
[MessengerId((ushort)RelayMessengerIds.NodeReport)]
public void NodeReport(IConnection connection)
{
relayServerReportResolver.Add(connection.ReceiveRequestWrap.Payload.Length, 0);
RelayServerNodeReportInfo170 info = serializer.Deserialize<RelayServerNodeReportInfo170>(connection.ReceiveRequestWrap.Payload.Span);
relayServerTransfer.SetNodeReport(connection, info);
try
{
relayServerReportResolver.Add(connection.ReceiveRequestWrap.Payload.Length, 0);
RelayServerNodeReportInfo170 info = serializer.Deserialize<RelayServerNodeReportInfo170>(connection.ReceiveRequestWrap.Payload.Span);
relayServerTransfer.SetNodeReport(connection, info);
}
catch (Exception)
{
}
connection.Write(serializer.Serialize(VersionHelper.Version));
}
[MessengerId((ushort)RelayMessengerIds.NodeReport188)]
public void NodeReport188(IConnection connection)
{
relayServerReportResolver.Add(connection.ReceiveRequestWrap.Payload.Length, 0);
RelayServerNodeReportInfo188 info = serializer.Deserialize<RelayServerNodeReportInfo188>(connection.ReceiveRequestWrap.Payload.Span);
relayServerTransfer.SetNodeReport(connection, info);
try
{
relayServerReportResolver.Add(connection.ReceiveRequestWrap.Payload.Length, 0);
RelayServerNodeReportInfo188 info = serializer.Deserialize<RelayServerNodeReportInfo188>(connection.ReceiveRequestWrap.Payload.Span);
relayServerTransfer.SetNodeReport(connection, info);
}
catch (Exception)
{
}
connection.Write(serializer.Serialize(VersionHelper.Version));
}
@@ -310,7 +322,6 @@ namespace linker.messenger.relay.messenger
}
}
/// <summary>
/// 重启
/// </summary>

12
src/linker.messenger.relay/server/IRelayServerNodeStore.cs
View File

@@ -84,7 +84,7 @@ namespace linker.messenger.relay.server
public bool AllowTcp { get; set; } = true;
public bool AllowUdp { get; set; }
public bool Sync2Server { get; set; }
public bool Sync2Server { get; set; }
}
public partial class RelayServerNodeUpdateWrapInfo
@@ -106,16 +106,16 @@ namespace linker.messenger.relay.server
public string Url { get; set; } = "https://linker-doc.snltty.com";
public bool AllowTcp { get; set; } = true;
public bool AllowUdp { get; set; } = false;
public bool AllowUdp { get; set; }
}
public sealed partial class RelayServerNodeUpdateWrapInfo188
public partial class RelayServerNodeUpdateWrapInfo188
{
public RelayServerNodeUpdateInfo188 Info { get; set; }
}
public sealed partial class RelayServerNodeUpdateInfo188 : RelayServerNodeUpdateInfo
public partial class RelayServerNodeUpdateInfo188 : RelayServerNodeUpdateInfo
{
public bool Sync2Server { get; set; } = false;
public bool Sync2Server { get; set; }
}
@@ -161,7 +161,7 @@ namespace linker.messenger.relay.server
public List<RelayServerNodeReportInfo> Nodes { get; set; } = new List<RelayServerNodeReportInfo>();
}
public partial class RelayAskResultInfo170: RelayAskResultInfo
public partial class RelayAskResultInfo170 : RelayAskResultInfo
{
public new List<RelayServerNodeReportInfo170> Nodes { get; set; } = new List<RelayServerNodeReportInfo170>();
}

1
src/linker.messenger.relay/server/RelayServerMasterTransfer.cs
View File

@@ -101,7 +101,6 @@ namespace linker.messenger.relay.server
LastTicks = info.LastTicks,
Url = info.Url,
Connection = connection
});
}
public void SetNodeReport(IConnection connection, RelayServerNodeReportInfo188 info)

6
src/linker.messenger.serializer.memorypack/Entry.cs
View File

@@ -25,7 +25,7 @@ namespace linker.messenger.serializer.memorypack
MemoryPackFormatterProvider.Register(new SignInConfigSetNameInfoFormatter());
MemoryPackFormatterProvider.Register(new SignInNamesResponseItemInfoFormatter());
MemoryPackFormatterProvider.Register(new SignInUserIdsResponseItemInfoFormatter());
MemoryPackFormatterProvider.Register(new SignInPushArgInfoFormatter());
@@ -79,7 +79,7 @@ namespace linker.messenger.serializer.memorypack
MemoryPackFormatterProvider.Register(new RelayTrafficUpdateInfoFormatter());
MemoryPackFormatterProvider.Register(new RelayCdkeyInfoFormatter());
@@ -121,7 +121,7 @@ namespace linker.messenger.serializer.memorypack
MemoryPackFormatterProvider.Register(new SForwardServerNodeReportInfoFormatter());
MemoryPackFormatterProvider.Register(new SForwardCdkeyInfoFormatter());
MemoryPackFormatterProvider.Register(new SForwardTrafficUpdateInfoFormatter());
MemoryPackFormatterProvider.Register(new ForwardInfoFormatter());
MemoryPackFormatterProvider.Register(new ForwardAddForwardInfoFormatter());

1
src/linker.messenger.serializer.memorypack/RelaySerializer.cs
View File

@@ -1291,4 +1291,5 @@ namespace linker.messenger.serializer.memorypack
value = wrapped.info;
}
}
}

16
src/linker.messenger.sforward/messenger/SForwardMessenger.cs
View File

@@ -59,8 +59,14 @@ namespace linker.plugins.sforward.messenger
[MessengerId((ushort)SForwardMessengerIds.NodeReport)]
public void NodeReport(IConnection connection)
{
SForwardServerNodeReportInfo info = serializer.Deserialize<SForwardServerNodeReportInfo>(connection.ReceiveRequestWrap.Payload.Span);
sForwardServerMasterTransfer.SetNodeReport(connection, info);
try
{
SForwardServerNodeReportInfo info = serializer.Deserialize<SForwardServerNodeReportInfo>(connection.ReceiveRequestWrap.Payload.Span);
sForwardServerMasterTransfer.SetNodeReport(connection, info);
}
catch (Exception)
{
}
connection.Write(serializer.Serialize(VersionHelper.Version));
}
@@ -175,7 +181,7 @@ namespace linker.plugins.sforward.messenger
public void Add191(IConnection connection)
{
SForwardAddInfo191 sForwardAddInfo = serializer.Deserialize<SForwardAddInfo191>(connection.ReceiveRequestWrap.Payload.Span);
SForwardAddResultInfo result = new SForwardAddResultInfo { Success = true, BufferSize = 3};
SForwardAddResultInfo result = new SForwardAddResultInfo { Success = true, BufferSize = 3 };
try
{
Add(sForwardAddInfo, result);
@@ -654,7 +660,7 @@ namespace linker.plugins.sforward.messenger
{
Connection = sign.Connection,
MessengerId = (ushort)SForwardMessengerIds.Proxy,
Payload = serializer.Serialize(new SForwardProxyInfo { Domain = host, RemotePort = port, Id = id, BufferSize = 3})
Payload = serializer.Serialize(new SForwardProxyInfo { Domain = host, RemotePort = port, Id = id, BufferSize = 3 })
}).ConfigureAwait(false);
}
return false;
@@ -674,7 +680,7 @@ namespace linker.plugins.sforward.messenger
{
Connection = sign.Connection,
MessengerId = (ushort)SForwardMessengerIds.Proxy,
Payload = serializer.Serialize(new SForwardProxyInfo { RemotePort = port, Id = id, BufferSize =3})
Payload = serializer.Serialize(new SForwardProxyInfo { RemotePort = port, Id = id, BufferSize = 3 })
}).ConfigureAwait(false);
}
return false;

6
src/linker.messenger.store.file/ConfigApiController.cs
View File

@@ -303,10 +303,10 @@ namespace linker.messenger.store.file
client.CApi,
client.AccessBits,
client.FullAccess,
Groups = new SignInClientGroupInfo[] { config.Data.Client.Groups[0] },
Servers = new SignInClientServerInfo[] { config.Data.Client.Servers[0] },
Groups = new SignInClientGroupInfo[] { client.Group },
Servers = new SignInClientServerInfo[] { client.Server },
client.Updater,
Relay = new { Servers = new RelayServerInfo[] { client.Relay.Servers[0] } },
Relay = new { Servers = new RelayServerInfo[] { client.Relay.Server } },
client.Tunnel,
}, common, new { Install = true, Modes = new string[] { "client" } });
}

4
src/linker.messenger.store.file/relay/RelayServerNodeStore.cs
View File

@@ -39,7 +39,7 @@ namespace linker.messenger.store.file.relay
}
public void SetMaxGbTotalLastBytes(long value)
{
config.Data.Server.Relay.Distributed.Node.MaxGbTotalLastBytes=value;
config.Data.Server.Relay.Distributed.Node.MaxGbTotalLastBytes = value;
}
public void SetMaxGbTotalMonth(int month)
@@ -47,6 +47,6 @@ namespace linker.messenger.store.file.relay
config.Data.Server.Relay.Distributed.Node.MaxGbTotalMonth = month;
}
}
}

5
src/linker/linker.csproj
View File

@@ -23,9 +23,8 @@
<Description>1. 一些累计更新
2. 服务器转发多节点
3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速
4. 一些代码优化、修复一些错误
5. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议
6. 其它一些小改变</Description>
4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议
5. 一些代码优化，修复一些错误，其它一些小改变</Description>
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>

7
version.txt
View File

@@ -1,8 +1,7 @@
v1.9.1
2025-08-31 01:38:15
2025-08-31 14:36:54
1. 一些累计更新
2. 服务器转发多节点
3. 虚拟网卡下伪造ACK为TCP-in-TCP隧道提速
4. 一些代码优化、修复一些错误
5. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议
6. 其它一些小改变
4. 新增一个UDP同时打开的打洞协议，优化了一下TCP同时打开的打洞协议
5. 一些代码优化，修复一些错误，其它一些小改变