wiz0u/WTelegramClient
1
0
Fork 0
mirror of https://github.com/wiz0u/WTelegramClient.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #233: "server_address" can hint the dcId in order to reuse existing AuthKey on last-ditch reconnection

Browse source
This commit is contained in:
Wizou 2024-02-19 17:08:26 +01:00
parent 6a1114ccd5
commit 1c298bfa83
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Client.cs
View file

@ -136,9 +136,9 @@ namespace WTelegram
Path.GetDirectoryName(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar))) Path.GetDirectoryName(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar)))
?? AppDomain.CurrentDomain.BaseDirectory, "WTelegram.session"), ?? AppDomain.CurrentDomain.BaseDirectory, "WTelegram.session"),
#if DEBUG #if DEBUG
"server_address" => "149.154.167.40:443", // Test DC 2 "server_address" => "2>149.154.167.40:443", // Test DC 2
#else #else
"server_address" => "149.154.167.50:443", // DC 2 "server_address" => "2>149.154.167.50:443", // DC 2
#endif #endif
"device_model" => Environment.Is64BitOperatingSystem ? "PC 64bit" : "PC 32bit", "device_model" => Environment.Is64BitOperatingSystem ? "PC 64bit" : "PC 32bit",
"system_version" => Helpers.GetSystemVersion(), "system_version" => Helpers.GetSystemVersion(),
@ -772,6 +772,13 @@ namespace WTelegram
return tcpClient; return tcpClient;
} }
private IPEndPoint GetDefaultEndpoint(out int dcId)
{
string addr = Config("server_address");
dcId = addr.Length > 2 && addr[1] == '>' && addr[0] is > '0' and <= '9' ? addr[0] - '0' : 0;
return Compat.IPEndPoint_Parse(dcId == 0 ? addr : addr[2..]);
}
/// <summary>Establish connection to Telegram servers without negociating a user session</summary> /// <summary>Establish connection to Telegram servers without negociating a user session</summary>
/// <param name="quickResume">Attempt to resume session immediately without issuing Layer/InitConnection/GetConfig <i>(not recommended by default)</i></param> /// <param name="quickResume">Attempt to resume session immediately without issuing Layer/InitConnection/GetConfig <i>(not recommended by default)</i></param>
/// <remarks>Usually you shouldn't need to call this method: Use <see cref="LoginUserIfNeeded">LoginUserIfNeeded</see> instead. <br/>Config callback is queried for: <b>server_address</b></remarks> /// <remarks>Usually you shouldn't need to call this method: Use <see cref="LoginUserIfNeeded">LoginUserIfNeeded</see> instead. <br/>Config callback is queried for: <b>server_address</b></remarks>
@ -819,7 +826,7 @@ namespace WTelegram
} }
else else
{ {
endpoint = _dcSession?.EndPoint ?? Compat.IPEndPoint_Parse(Config("server_address")); endpoint = _dcSession?.EndPoint ?? GetDefaultEndpoint(out int defaultDc);
Helpers.Log(2, $"Connecting to {endpoint}..."); Helpers.Log(2, $"Connecting to {endpoint}...");
TcpClient tcpClient = null; TcpClient tcpClient = null;
try try
@ -855,11 +862,13 @@ namespace WTelegram
} }
if (tcpClient == null) if (tcpClient == null)
{ {
endpoint = Compat.IPEndPoint_Parse(Config("server_address")); // re-ask callback for an address endpoint = GetDefaultEndpoint(out defaultDc); // re-ask callback for an address
if (!triedEndpoints.Add(endpoint)) throw; if (!triedEndpoints.Add(endpoint)) throw;
_dcSession.Client = null; _dcSession.Client = null;
// is it address for a known DCSession? // is it address for a known DCSession?
_dcSession = _session.DCSessions.Values.FirstOrDefault(dcs => dcs.EndPoint.Equals(endpoint)); _dcSession = _session.DCSessions.Values.FirstOrDefault(dcs => dcs.EndPoint.Equals(endpoint));
if (_dcSession == null && defaultDc != 0 && _session.DCSessions.TryGetValue(defaultDc, out _dcSession))
_dcSession.DataCenter = null;
_dcSession ??= new() { Id = Helpers.RandomLong() }; _dcSession ??= new() { Id = Helpers.RandomLong() };
_dcSession.Client = this; _dcSession.Client = this;
Helpers.Log(2, $"Connecting to {endpoint}..."); Helpers.Log(2, $"Connecting to {endpoint}...");