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

fixed not to conflict

Browse source 
! IsConnected is restored as it was before
+ TcpTransport has got a connect method which properly initializes the underlying tcpclient
This commit is contained in:
solarin 2020-04-08 23:20:54 +04:00
parent c67801a6c9
commit 2bcae5bd9b
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
TLSharp.Core/Network/TcpTransport.cs
View file

@ -12,23 +12,36 @@ namespace TLSharp.Core.Network
public class TcpTransport : IDisposable
{
private readonly TcpClient tcpClient;
private readonly NetworkStream stream;
private TcpClient tcpClient;
private NetworkStream stream;
private int sendCounter = 0;
TcpClientConnectionHandler handler;
string address;
int port;
IPAddress ipAddress;
public TcpTransport(string address, int port, TcpClientConnectionHandler handler = null)
{
this.handler = handler;
this.address = address;
this.port = port;
ipAddress = IPAddress.Parse(address);
}
public async Task Connect()
{
if (handler == null)
{
var ipAddress = IPAddress.Parse(address);
var endpoint = new IPEndPoint(ipAddress, port);
if (tcpClient != null)
{
tcpClient.Close();
}
tcpClient = new TcpClient(ipAddress.AddressFamily);
try {
tcpClient.Connect (endpoint);
await tcpClient.ConnectAsync(ipAddress, port);
} catch (Exception ex) {
throw new Exception ($"Problem when trying to connect to {endpoint}; either there's no internet connection or the IP address version is not compatible (if the latter, consider using DataCenterIPVersion enum)",
throw new Exception ($"Problem when trying to connect to {ipAddress}:{port}; either there's no internet connection or the IP address version is not compatible (if the latter, consider using DataCenterIPVersion enum)",
ex);
}
}
@ -102,7 +115,7 @@ namespace TLSharp.Core.Network
{
get
{
return this.tcpClient.Connected;
return this.tcpClient != null && this.tcpClient.Connected;
}
}

5
TLSharp.Core/TelegramClient.cs
View file

@ -72,6 +72,11 @@ namespace TLSharp.Core
{
token.ThrowIfCancellationRequested();
if (!transport.IsConnected)
await transport.Connect();
if (!transport.IsConnected)
throw new Exception("Connection to Telegram failed");
if (session.AuthKey == null || reconnect)
{
var result = await Authenticator.DoAuthentication(transport, token).ConfigureAwait(false);