pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-04-12 12:06:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12 from PepperDash/hotfix/sshClient-connect-protection

Browse source 
Adds semaphore to GenericSshClient.Connect()
This commit is contained in:
Andrew Welker 2020-02-25 16:15:46 -07:00 • committed by GitHub
commit 9f4e271675
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
View file

@ -62,6 +62,8 @@ namespace PepperDash.Core
get { return ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
}
private bool IsConnecting = false;
/// <summary>
/// S+ helper for IsConnected
/// </summary>
@ -184,6 +186,13 @@ namespace PepperDash.Core
/// </summary>
public void Connect()
{
if (IsConnecting)
{
Debug.Console(0, this, "Connection attempt in progress. Exiting Connect()");
return;
}
IsConnecting = true;
ConnectEnabled = true;
Debug.Console(1, this, "attempting connect");
@ -236,6 +245,7 @@ namespace PepperDash.Core
//TheStream.ErrorOccurred += TheStream_ErrorOccurred;
Debug.Console(1, this, "Connected");
ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
IsConnecting = false;
return; // Success will not pass here
}
catch (SshConnectionException e)
@ -291,6 +301,7 @@ namespace PepperDash.Core
if (Client != null)
{
IsConnecting = false;
Client.Disconnect();
Client = null;
ClientStatus = status;
@ -303,6 +314,7 @@ namespace PepperDash.Core
/// </summary>
void HandleConnectionFailure()
{
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
Debug.Console(2, this, "Client nulled due to connection failure. AutoReconnect: {0}, ConnectEnabled: {1}", AutoReconnect, ConnectEnabled);