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

Trying and failing lots of things to fix SshClient. About to try making and destroying the entire client

Browse Source
This commit is contained in:
Heath Volmer
2016-12-06 15:41:49 -07:00
parent d1ce18fb64
commit d7613d2f52
8 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
View File

@@ -222,7 +222,7 @@ namespace PepperDash.Core
if (TheStream != null)
{
TheStream.DataReceived -= Stream_DataReceived;
TheStream.ErrorOccurred += TheStream_ErrorOccurred;
TheStream.ErrorOccurred -= TheStream_ErrorOccurred;
}
TheStream = null;
}
@@ -242,10 +242,15 @@ namespace PepperDash.Core
try
{
Client.Connect();
if (Client.IsConnected)
{
Client.KeepAliveInterval = TimeSpan.FromSeconds(2);
Client.SendKeepAlive();
#warning We are getting past here with a false IsConnected when it appears to be connected
// Have to assume client is connected cause Client.IsConnected is busted in some cases
// All other conditions *should* error out...
//if (Client.IsConnected)
//{
//Client.KeepAliveInterval = TimeSpan.FromSeconds(2);
//Client.SendKeepAlive();
TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
TheStream.DataReceived += Stream_DataReceived;
TheStream.ErrorOccurred += TheStream_ErrorOccurred;
@@ -255,7 +260,7 @@ namespace PepperDash.Core
PreviousPassword = Password;
PreviousPort = Port;
PreviousUsername = Username;
}
//}
return; // Success will not pass here
}
catch (SshConnectionException e)
@@ -340,7 +345,7 @@ namespace PepperDash.Core
if (TheStream != null)
{
TheStream.DataReceived -= Stream_DataReceived;
TheStream.ErrorOccurred += TheStream_ErrorOccurred;
TheStream.ErrorOccurred -= TheStream_ErrorOccurred;
TheStream.Close();
TheStream.Dispose();
TheStream = null;
@@ -401,7 +406,7 @@ namespace PepperDash.Core
/// </summary>
void Client_ErrorOccurred(object sender, Crestron.SimplSharp.Ssh.Common.ExceptionEventArgs e)
{
if (e.Exception is SshConnectionException)
if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
Debug.Console(1, this, "Disconnected by remote");
else
Debug.Console(1, this, "Unhandled SSH client error: {0}", e.Exception);