pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-16 21:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request and build

Browse Source
This commit is contained in:
Heath Volmer
2018-02-22 15:10:33 -07:00
parent 0f2d1d9d15 b8b3324243
commit cb63734fba
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Pepperdash Core/CLZ Builds/PepperDash_Core.clz
View File

Binary file not shown.

BIN
Pepperdash Core/CLZ Builds/PepperDash_Core.dll
View File

Binary file not shown.

35
Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
View File

@@ -194,12 +194,8 @@ namespace PepperDash.Core
{ {
if (programEventType == eProgramStatusEventType.Stopping) if (programEventType == eProgramStatusEventType.Stopping)
{ {
if (Client != null) Debug.Console(1, this, "Program stopping. Closing connection");
{ DisconnectClient();
Debug.Console(1, this, "Program stopping. Closing connection");
Client.DisconnectFromServer();
Client.Dispose();
}
} }
} }
@@ -217,8 +213,8 @@ namespace PepperDash.Core
public void Connect() public void Connect()
{ {
if (IsConnected) if (IsConnected)
return; DisconnectClient();
if (string.IsNullOrEmpty(Hostname)) if (string.IsNullOrEmpty(Hostname))
{ {
@@ -233,8 +229,11 @@ namespace PepperDash.Core
} }
} }
Client = new TCPClient(Hostname, Port, BufferSize); if (Client == null)
Client.SocketStatusChange += Client_SocketStatusChange; {
Client = new TCPClient(Hostname, Port, BufferSize);
Client.SocketStatusChange += Client_SocketStatusChange;
}
Client.ConnectToServerAsync(null); Client.ConnectToServerAsync(null);
DisconnectCalledByUser = false; DisconnectCalledByUser = false;
@@ -243,9 +242,20 @@ namespace PepperDash.Core
public void Disconnect() public void Disconnect()
{ {
DisconnectCalledByUser = true; DisconnectCalledByUser = true;
Client.DisconnectFromServer(); DisconnectClient();
} }
public void DisconnectClient()
{
if (Client != null)
{
Debug.Console(1, this, "Disconnecting client");
//Client.SocketStatusChange -= Client_SocketStatusChange;
if(IsConnected)
Client.DisconnectFromServer();
}
}
void ConnectToServerCallback(TCPClient c) void ConnectToServerCallback(TCPClient c)
{ {
if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED) if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
@@ -254,7 +264,8 @@ namespace PepperDash.Core
void WaitAndTryReconnect() void WaitAndTryReconnect()
{ {
Client.DisconnectFromServer(); DisconnectClient();
Debug.Console(2, "Attempting reconnect, status={0}", Client.ClientStatus); Debug.Console(2, "Attempting reconnect, status={0}", Client.ClientStatus);
if(!DisconnectCalledByUser) if(!DisconnectCalledByUser)
RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs); RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs);