From efe60b3ae0838baa78add5563fd331e3decff09c Mon Sep 17 00:00:00 2001 From: Jason T Alborough Date: Wed, 2 Oct 2019 15:55:17 -0400 Subject: [PATCH 1/2] Adds RecivedFromCLientIndexUshort to GenericTcpServerCommMethodRecieveTextArgs --- Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs index e9e9f1f..ecf6db8 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs @@ -76,6 +76,14 @@ namespace PepperDash.Core public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs { public uint ReceivedFromClientIndex { get; private set; } + public ushort ReceivedFromClientIndexShort + { + get + { + return (ushort)ReceivedFromClientIndex; + } + } + public string Text { get; private set; } public GenericTcpServerCommMethodReceiveTextArgs(string text) From 139777b501044030d9132ce659d50115685eed03 Mon Sep 17 00:00:00 2001 From: Jason T Alborough Date: Fri, 11 Oct 2019 05:59:10 -0400 Subject: [PATCH 2/2] Adds conditions for when creating a new Ssh client. --- Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs | 7 ++++++- Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs index 6af5d7b..8a6e9fd 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs @@ -221,7 +221,12 @@ namespace PepperDash.Core Debug.Console(1, this, "Creating new SshClient"); ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth); - Client = new SshClient(connectionInfo); + + if (Client == null) + { + Client = new SshClient(connectionInfo); + } + Client.ErrorOccurred -= Client_ErrorOccurred; Client.ErrorOccurred += Client_ErrorOccurred; //You can do it! diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs index 525f32b..e9a7ccf 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs @@ -250,8 +250,6 @@ namespace PepperDash.Core if (Client == null) { - - Client = new TCPClient(Hostname, Port, BufferSize); Client.SocketStatusChange += Client_SocketStatusChange; }