pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-01-11 19:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix/PDC-29_SshIssues' into HEAD

Browse Source
This commit is contained in:
Neil Dorin
2019-10-15 12:30:11 -06:00
parent 8174ece650 139777b501
commit 3a054be26a
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs
View File

@@ -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)

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

@@ -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!

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

@@ -250,8 +250,6 @@ namespace PepperDash.Core
if (Client == null)
{
Client = new TCPClient(Hostname, Port, BufferSize);
Client.SocketStatusChange += Client_SocketStatusChange;
}