gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-11 01:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added more tracing, and break receive loop when we start disconnecting.

Browse Source
This commit is contained in:
drieseng
2016-09-08 21:45:47 +02:00
parent 4632a33e43
commit b413970148
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet/Session.cs
+17 -2
View File
@@ -1866,6 +1866,8 @@ namespace Renci.SshNet
{
try
{
DiagnosticAbstraction.Log(string.Format("[{0}] Shutting down socket.", ToHex(SessionId)));
// interrupt any pending reads; should be done outside of socket read lock as we
// actually want shutdown the socket to make sure blocking reads are interrupted
//
@@ -1891,13 +1893,26 @@ namespace Renci.SshNet
}
#endif // FEATURE_SOCKET_POLL
}
catch (SshOperationTimeoutException ex)
{
// TODO: log as info or debug
DiagnosticAbstraction.Log("Time-out shutting down socket or clearing read buffer: " + ex);
}
catch (SocketException ex)
{
// TODO: log as info or debug
DiagnosticAbstraction.Log("Failure shutting down socket or clearing read buffer: " + ex);
}
catch (Exception ex)
{
// TODO: log as warning
DiagnosticAbstraction.Log("Time-out shutting down socket or clearing read buffer: " + ex);
}
}
DiagnosticAbstraction.Log(string.Format("[{0}] Disposing socket.", ToHex(SessionId)));
_socket.Dispose();
DiagnosticAbstraction.Log(string.Format("[{0}] Disposed socket.", ToHex(SessionId)));
_socket = null;
}
}
@@ -1913,8 +1928,8 @@ namespace Renci.SshNet
{
var readSockets = new List<Socket> {_socket};
// remain in message loop until socket is shut down
while (true)
// remain in message loop until socket is shut down or until we're disconnecting
while (!_isDisconnecting)
{
#if FEATURE_SOCKET_POLL
Socket.Select(readSockets, null, null, -1);