Merge pull request #180 from PepperDash/hotfix/ssh-fix

Hotfix/ssh fix

Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs

@@ -249,8 +249,6 @@ namespace PepperDash.Core
                     Debug.Console(1, this, "Creating new SshClient");
                     ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
                     Client = new SshClient(connectionInfo);
-
-                    Client.ErrorOccurred -= Client_ErrorOccurred;
                     Client.ErrorOccurred += Client_ErrorOccurred;
 
                     //Attempt to connect
@@ -259,6 +257,11 @@ namespace PepperDash.Core
                     {
                         Client.Connect();
                         TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
+                        if (TheStream.DataAvailable)
+                        {
+                            // empty the buffer if there is data
+                            string str = TheStream.Read();
+                        }
                         TheStream.DataReceived += Stream_DataReceived;
                         Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Connected");
                         ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
@@ -320,7 +323,7 @@ namespace PepperDash.Core
 			if (ReconnectTimer != null)
 			{
 				ReconnectTimer.Stop();
-				ReconnectTimer = null;
+				// ReconnectTimer = null;
 			}
 
             KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
@@ -333,14 +336,23 @@ namespace PepperDash.Core
         {
             KillStream();
 
+            try
+            {
                 if (Client != null)
                 {
+                    Client.ErrorOccurred -= Client_ErrorOccurred;
                     Client.Disconnect();
+                    Client.Dispose();
                     Client = null;
                     ClientStatus = status;
                     Debug.Console(1, this, "Disconnected");
                 }
             }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception in Kill Client:{0}", ex);
+            }
+        }
 
 		/// <summary>
 		/// Anything to do with reestablishing connection on failures
@@ -374,6 +386,8 @@ namespace PepperDash.Core
         /// Kills the stream
         /// </summary>
 		void KillStream()
+		{
+            try
             {
                 if (TheStream != null)
                 {
@@ -384,6 +398,11 @@ namespace PepperDash.Core
                     Debug.Console(1, this, "Disconnected stream");
                 }
             }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception in Kill Stream:{0}", ex);
+            }
+		}
 
 		/// <summary>
 		/// Handles the keyboard interactive authentication, should it be required.
@@ -400,12 +419,17 @@ namespace PepperDash.Core
 		/// </summary>
 		void Stream_DataReceived(object sender, Crestron.SimplSharp.Ssh.Common.ShellDataEventArgs e)
 		{
-			var bytes = e.Data;
+            if (((ShellStream)sender).Length <= 0L)
-			if (bytes.Length > 0)
             {
+                return;
+            }
+            var response = ((ShellStream)sender).Read(); 
+ 
 			var bytesHandler = BytesReceived;
+            
 		    if (bytesHandler != null)
 		    {
+                var bytes = Encoding.UTF8.GetBytes(response);
 		        if (StreamDebugging.RxStreamDebuggingIsEnabled)
 		        {
 		            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
@@ -416,13 +440,12 @@ namespace PepperDash.Core
 			var textHandler = TextReceived;
 			if (textHandler != null)
 			{
-					var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
                 if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetDebugText(str));
+                    Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetDebugText(response));
 
-                    textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+                textHandler(this, new GenericCommMethodReceiveTextArgs(response));
-                }
             }
+			
 		}
 
 
@@ -478,23 +501,34 @@ namespace PepperDash.Core
 		        if (Client != null && TheStream != null && IsConnected)
 		        {
 		            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                        Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+		                Debug.Console(0,
+		                              this,
+		                              "Sending {0} characters of text: '{1}'",
+		                              text.Length,
+		                              ComTextHelper.GetDebugText(text));
 
 		            TheStream.Write(text);
 		            TheStream.Flush();
-
 		        }
 		        else
 		        {
 		            Debug.Console(1, this, "Client is null or disconnected.  Cannot Send Text");
 		        }
+		    }
+		    catch (ObjectDisposedException ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
+
+		        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                ReconnectTimer.Reset();
 		    }
 			catch (Exception ex)
 			{
-			    Debug.Console(0, "Exception: {0}", ex.Message);
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
-			    Debug.Console(0, "Stack Trace: {0}", ex.StackTrace);
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
 
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing");
+				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed");
 			}
 		}
 
@@ -519,9 +553,20 @@ namespace PepperDash.Core
                     Debug.Console(1, this, "Client is null or disconnected.  Cannot Send Bytes");
                 }
             }
-			catch
+            catch (ObjectDisposedException ex)
             {
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed. Disconnected, closing");
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
+
+                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                ReconnectTimer.Reset();
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Exception: {0}", ex.Message);
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Stack Trace: {0}", ex.StackTrace);
+
+				Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stream write failed");
 			}
 		}
 

Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs

@@ -221,6 +221,7 @@ namespace PepperDash.Core
         public GenericTcpIpClient()
 			: base(SplusKey)
         {
+            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			AutoReconnectIntervalMs = 5000;
             BufferSize = 2000;