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

Post Cp3N and Mac server testing, with disco testing on mac server

Browse Source
This commit is contained in:
Heath Volmer
2016-08-03 16:43:02 -06:00
parent 433b4eba81
commit cb5d36de51
6 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,17 +59,9 @@ namespace PepperDash.Core
public ushort UStatus { get; private set; } public ushort UStatus { get; private set; }
/// <summary> /// <summary>
/// Determines whether client will attempt reconnection on failure /// Determines whether client will attempt reconnection on failure. Default is true
/// </summary> /// </summary>
public bool AutoReconnect { get; set; } public bool AutoReconnect { get; set; }
/// <summary>
/// S+ helper for bool value
/// </summary>
public ushort UAutoReconnect
{
set { AutoReconnect = value == 1; }
}
/// <summary> /// <summary>
/// Millisecond value, determines the timeout period in between reconnect attempts /// Millisecond value, determines the timeout period in between reconnect attempts
@@ -85,7 +77,7 @@ namespace PepperDash.Core
base(key) base(key)
{ {
AutoReconnectIntervalMs = 5000; AutoReconnectIntervalMs = 5000;
AutoReconnect = true;
Hostname = hostname; Hostname = hostname;
Port = port; Port = port;
Username = username; Username = username;
@@ -125,7 +117,7 @@ namespace PepperDash.Core
Debug.Console(1, this, "Connected"); Debug.Console(1, this, "Connected");
TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534); TheStream = Client.CreateShellStream("PDTShell", 100, 80, 100, 200, 65534);
TheStream.DataReceived += Stream_DataReceived; TheStream.DataReceived += Stream_DataReceived;
TheStream.ErrorOccurred += Stream_ErrorOccurred; //TheStream.ErrorOccurred += Stream_ErrorOccurred;
} }
return; return;
@@ -240,13 +232,13 @@ namespace PepperDash.Core
} }
} }
/// <summary> ///// <summary>
/// Error event handler for stream events ///// Error event handler for stream events
/// </summary> ///// </summary>
void Stream_ErrorOccurred(object sender, ExceptionEventArgs e) //void Stream_ErrorOccurred(object sender, ExceptionEventArgs e)
{ //{
Debug.Console(2, this, "CRITICAL: PLEASE REPORT - SSH client stream error:\r{0}", e.Exception); // Debug.Console(2, this, "CRITICAL: PLEASE REPORT - SSH client stream error:\r{0}", e.Exception);
} //}
/// <summary> /// <summary>
/// Error event handler for client events - disconnect, etc. Will forward those events via ConnectionChange /// Error event handler for client events - disconnect, etc. Will forward those events via ConnectionChange
@@ -254,12 +246,12 @@ namespace PepperDash.Core
/// </summary> /// </summary>
void Client_ErrorOccurred(object sender, Crestron.SimplSharp.Ssh.Common.ExceptionEventArgs e) void Client_ErrorOccurred(object sender, Crestron.SimplSharp.Ssh.Common.ExceptionEventArgs e)
{ {
Debug.Console(0, this, "SSH client error: {0}", e.Exception); if (!(e.Exception is SshConnectionException))
if (e.Exception is SocketException)
{ {
// ****LOG SOMETHING Debug.Console(0, this, "SSH client error: {0}", e.Exception);
UStatus = 4; UStatus = 4;
} }
Debug.Console(1, this, "Disconnected by remote");
IsConnected = false; IsConnected = false;
HandleConnectionFailure(); HandleConnectionFailure();
} }

2
Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
View File

@@ -82,7 +82,7 @@
<Programmer /> <Programmer />
<ArchiveFilename>C:\Users\hvolm\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz</ArchiveFilename> <ArchiveFilename>C:\Users\hvolm\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz</ArchiveFilename>
<MinFirmwareVersion>1.007.0017</MinFirmwareVersion> <MinFirmwareVersion>1.007.0017</MinFirmwareVersion>
<CompiledOn>8/3/2016 3:25:15 PM</CompiledOn> <CompiledOn>8/3/2016 4:33:09 PM</CompiledOn>
<AdditionalInfo /> <AdditionalInfo />
<EmbedSourceArchive>False</EmbedSourceArchive> <EmbedSourceArchive>False</EmbedSourceArchive>
<CopyTo /> <CopyTo />

BIN
Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz
View File

Binary file not shown.

4
Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config
View File

@@ -10,7 +10,7 @@
<ArchiveName /> <ArchiveName />
</RequiredInfo> </RequiredInfo>
<OptionalInfo> <OptionalInfo>
<CompiledOn>8/3/2016 3:25:15 PM</CompiledOn> <CompiledOn>8/3/2016 4:33:09 PM</CompiledOn>
<CompilerRev>1.0.0.25957</CompilerRev> <CompilerRev>1.0.0.27993</CompilerRev>
</OptionalInfo> </OptionalInfo>
</ProgramInfo> </ProgramInfo>

2
Pepperdash Core/Pepperdash Core/bin/manifest.info
View File

@@ -1,4 +1,4 @@
MainAssembly=PepperDash_Core.dll:2888e497caab5a6d6578b6174add3a96 MainAssembly=PepperDash_Core.dll:ca423b7b3c2fe76c3d6a8b9cb9ff67cd
MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyMinFirmwareVersion=1.007.0017
ü ü
DependencySource=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896 DependencySource=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896

BIN
Pepperdash Core/Pepperdash Core/bin/manifest.ser
View File

Binary file not shown.