apps/linker
1
0
Fork 0
mirror of https://github.com/snltty/linker.git synced 2025-10-16 22:21:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化更新

Browse Source
This commit is contained in:
snltty
2024-09-05 09:20:19 +08:00
parent 3824e514bb
commit f7f3e8bbdd
8 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
linker/plugins/relay/RelayTransfer.cs
View File

@@ -181,8 +181,9 @@ namespace linker.plugins.relay
SecretKey = item.SecretKey,
Server = server,
TransactionId = transactionId,
TransportName = $"{transport.Name}|{item.Name}",
SSL = item.SSL
TransportName = transport.Name,
SSL = item.SSL,
ServerName = item.Name
};
LoggerHelper.Instance.Info($"relay to {relayInfo.RemoteMachineId}->{relayInfo.RemoteMachineName} {relayInfo.ToJson()}");
@@ -224,7 +225,9 @@ namespace linker.plugins.relay
try
{
await TestServer(relayInfo);
RelayServerInfo server = running.Data.Relay.Servers.FirstOrDefault(c => c.Name == relayInfo.ServerName) ?? running.Data.Relay.Servers.FirstOrDefault();
relayInfo.Server = NetworkHelper.GetEndPoint(server.Host, 3478);
ITransport _transports = transports.FirstOrDefault(c => c.Name == relayInfo.TransportName);
if (_transports != null)
{
@@ -257,28 +260,6 @@ namespace linker.plugins.relay
}
return false;
}
private async Task TestServer(RelayInfo relayInfo)
{
string[] arr = relayInfo.TransportName.Split('|');
relayInfo.TransportName = arr[0];
try
{
Socket socket = new Socket(relayInfo.Server.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(relayInfo.Server).WaitAsync(TimeSpan.FromMilliseconds(500)).ConfigureAwait(false);
socket.SafeClose();
}
catch (Exception)
{
RelayServerInfo server = null;
if (arr.Length > 1)
{
server = running.Data.Relay.Servers.FirstOrDefault(c => c.Name == arr[1]);
}
server ??= running.Data.Relay.Servers.FirstOrDefault();
relayInfo.Server = NetworkHelper.GetEndPoint(server.Host, 3478);
}
}
/// <summary>
/// 回调