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

Merge pull request #50 from PepperDash/hotfix/ssh-issues

Browse Source 
Fix issue with ssh connections dropping
This commit is contained in:
Andrew Welker
2020-08-14 13:23:06 -04:00
committed by GitHub
parent 8e39c4b743 6133df971d
commit 225fb9c3e9
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ namespace PepperDash.Core
/// </summary> /// </summary>
public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
{ {
private const string SPlusKey = "Uninitialized SshClient";
public CommunicationStreamDebugging StreamDebugging { get; private set; } public CommunicationStreamDebugging StreamDebugging { get; private set; }
/// <summary> /// <summary>
@@ -155,8 +156,9 @@ namespace PepperDash.Core
/// S+ Constructor - Must set all properties before calling Connect /// S+ Constructor - Must set all properties before calling Connect
/// </summary> /// </summary>
public GenericSshClient() public GenericSshClient()
: base("Uninitialized SshClient") : base(SPlusKey)
{ {
StreamDebugging = new CommunicationStreamDebugging(SPlusKey);
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler); CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
AutoReconnectIntervalMs = 5000; AutoReconnectIntervalMs = 5000;
} }
@@ -243,7 +245,7 @@ namespace PepperDash.Core
try try
{ {
Client.Connect(); Client.Connect();
TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 100000); TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
TheStream.DataReceived += Stream_DataReceived; TheStream.DataReceived += Stream_DataReceived;
//TheStream.ErrorOccurred += TheStream_ErrorOccurred; //TheStream.ErrorOccurred += TheStream_ErrorOccurred;
Debug.Console(1, this, "Connected"); Debug.Console(1, this, "Connected");
@@ -437,8 +439,11 @@ namespace PepperDash.Core
} }
} }
catch catch (Exception ex)
{ {
Debug.Console(0, "Exception: {0}", ex.Message);
Debug.Console(0, "Stack Trace: {0}", ex.StackTrace);
Debug.Console(1, this, "Stream write failed. Disconnected, closing"); Debug.Console(1, this, "Stream write failed. Disconnected, closing");
ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY; ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY;
HandleConnectionFailure(); HandleConnectionFailure();

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

@@ -15,7 +15,8 @@ namespace PepperDash.Core
/// A class to handle basic TCP/IP communications with a server /// A class to handle basic TCP/IP communications with a server
/// </summary> /// </summary>
public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
{ {
private const string SplusKey = "Uninitialized TcpIpClient";
public CommunicationStreamDebugging StreamDebugging { get; private set; } public CommunicationStreamDebugging StreamDebugging { get; private set; }
/// <summary> /// <summary>
@@ -204,8 +205,9 @@ namespace PepperDash.Core
/// Default constructor for S+ /// Default constructor for S+
/// </summary> /// </summary>
public GenericTcpIpClient() public GenericTcpIpClient()
: base("Uninitialized TcpIpClient") : base(SplusKey)
{ {
StreamDebugging = new CommunicationStreamDebugging(SplusKey);
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler); CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
AutoReconnectIntervalMs = 5000; AutoReconnectIntervalMs = 5000;
BufferSize = 2000; BufferSize = 2000;

4
Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs
View File

@@ -17,6 +17,7 @@ namespace PepperDash.Core
{ {
public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
{ {
private const string SplusKey = "Uninitialized Udp Server";
public CommunicationStreamDebugging StreamDebugging { get; private set; } public CommunicationStreamDebugging StreamDebugging { get; private set; }
/// <summary> /// <summary>
/// ///
@@ -119,8 +120,9 @@ namespace PepperDash.Core
/// Constructor for S+. Make sure to set key, address, port, and buffersize using init method /// Constructor for S+. Make sure to set key, address, port, and buffersize using init method
/// </summary> /// </summary>
public GenericUdpServer() public GenericUdpServer()
: base("Uninitialized Udp Server") : base(SplusKey)
{ {
StreamDebugging = new CommunicationStreamDebugging(SplusKey);
BufferSize = 5000; BufferSize = 5000;
DequeueLock = new CCriticalSection(); DequeueLock = new CCriticalSection();
MessageQueue = new CrestronQueue<GenericUdpReceiveTextExtraArgs>(); MessageQueue = new CrestronQueue<GenericUdpReceiveTextExtraArgs>();