|
|
@@ -27,7 +27,7 @@ namespace Renci.SshNet
|
|
|
private ISession _session;
|
|
|
private IChannelSession _channel;
|
|
|
private Exception _exception;
|
|
|
- private EventWaitHandle _errorOccuredWaitHandle = new ManualResetEvent(initialState: false);
|
|
|
+ private EventWaitHandle _errorOccurredWaitHandle = new ManualResetEvent(initialState: false);
|
|
|
private EventWaitHandle _sessionDisconnectedWaitHandle = new ManualResetEvent(initialState: false);
|
|
|
private EventWaitHandle _channelClosedWaitHandle = new ManualResetEvent(initialState: false);
|
|
|
private bool _isDisposed;
|
|
|
@@ -106,12 +106,12 @@ namespace Renci.SshNet
|
|
|
}
|
|
|
|
|
|
// reset waithandles in case we're reconnecting
|
|
|
- _ = _errorOccuredWaitHandle.Reset();
|
|
|
+ _ = _errorOccurredWaitHandle.Reset();
|
|
|
_ = _sessionDisconnectedWaitHandle.Reset();
|
|
|
_ = _sessionDisconnectedWaitHandle.Reset();
|
|
|
_ = _channelClosedWaitHandle.Reset();
|
|
|
|
|
|
- _session.ErrorOccured += Session_ErrorOccured;
|
|
|
+ _session.ErrorOccured += Session_ErrorOccurred;
|
|
|
_session.Disconnected += Session_Disconnected;
|
|
|
|
|
|
_channel = _session.CreateChannelSession();
|
|
|
@@ -185,7 +185,7 @@ namespace Renci.SshNet
|
|
|
|
|
|
_logger.LogInformation(error, "Raised exception");
|
|
|
|
|
|
- _ = _errorOccuredWaitHandle?.Set();
|
|
|
+ _ = _errorOccurredWaitHandle?.Set();
|
|
|
|
|
|
SignalErrorOccurred(error);
|
|
|
}
|
|
|
@@ -224,7 +224,7 @@ namespace Renci.SshNet
|
|
|
{
|
|
|
var waitHandles = new[]
|
|
|
{
|
|
|
- _errorOccuredWaitHandle,
|
|
|
+ _errorOccurredWaitHandle,
|
|
|
_sessionDisconnectedWaitHandle,
|
|
|
_channelClosedWaitHandle,
|
|
|
waitHandle
|
|
|
@@ -253,8 +253,8 @@ namespace Renci.SshNet
|
|
|
{
|
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
|
|
|
|
- var errorOccuredReg = ThreadPool.RegisterWaitForSingleObject(
|
|
|
- _errorOccuredWaitHandle,
|
|
|
+ var errorOccurredReg = ThreadPool.RegisterWaitForSingleObject(
|
|
|
+ _errorOccurredWaitHandle,
|
|
|
(tcs, _) => ((TaskCompletionSource<T>)tcs).TrySetException(_exception),
|
|
|
state: tcs,
|
|
|
millisecondsTimeOutInterval: -1,
|
|
|
@@ -296,7 +296,7 @@ namespace Renci.SshNet
|
|
|
}
|
|
|
finally
|
|
|
{
|
|
|
- _ = errorOccuredReg.Unregister(waitObject: null);
|
|
|
+ _ = errorOccurredReg.Unregister(waitObject: null);
|
|
|
_ = sessionDisconnectedReg.Unregister(waitObject: null);
|
|
|
_ = channelClosedReg.Unregister(waitObject: null);
|
|
|
}
|
|
|
@@ -323,7 +323,7 @@ namespace Renci.SshNet
|
|
|
{
|
|
|
var waitHandles = new[]
|
|
|
{
|
|
|
- _errorOccuredWaitHandle,
|
|
|
+ _errorOccurredWaitHandle,
|
|
|
_sessionDisconnectedWaitHandle,
|
|
|
_channelClosedWaitHandle,
|
|
|
waitHandle
|
|
|
@@ -377,7 +377,7 @@ namespace Renci.SshNet
|
|
|
{
|
|
|
var waitHandles = new[]
|
|
|
{
|
|
|
- _errorOccuredWaitHandle,
|
|
|
+ _errorOccurredWaitHandle,
|
|
|
_sessionDisconnectedWaitHandle,
|
|
|
_channelClosedWaitHandle,
|
|
|
waitHandleA,
|
|
|
@@ -416,7 +416,7 @@ namespace Renci.SshNet
|
|
|
/// </returns>
|
|
|
/// <exception cref="SshException">The connection was closed by the server.</exception>
|
|
|
/// <exception cref="SshException">The channel was closed.</exception>
|
|
|
- /// <exception cref="SshOperationTimeoutException">No object satified the wait and a time interval equivalent to <paramref name="millisecondsTimeout"/> has passed.</exception>
|
|
|
+ /// <exception cref="SshOperationTimeoutException">No object satisfied the wait and a time interval equivalent to <paramref name="millisecondsTimeout"/> has passed.</exception>
|
|
|
/// <remarks>
|
|
|
/// For the return value, the index of the first non-system object is considered to be zero.
|
|
|
/// </remarks>
|
|
|
@@ -452,7 +452,7 @@ namespace Renci.SshNet
|
|
|
{
|
|
|
return new WaitHandle[]
|
|
|
{
|
|
|
- _errorOccuredWaitHandle,
|
|
|
+ _errorOccurredWaitHandle,
|
|
|
_sessionDisconnectedWaitHandle,
|
|
|
_channelClosedWaitHandle,
|
|
|
waitHandle1,
|
|
|
@@ -471,7 +471,7 @@ namespace Renci.SshNet
|
|
|
public WaitHandle[] CreateWaitHandleArray(params WaitHandle[] waitHandles)
|
|
|
{
|
|
|
var array = new WaitHandle[waitHandles.Length + SystemWaitHandleCount];
|
|
|
- array[0] = _errorOccuredWaitHandle;
|
|
|
+ array[0] = _errorOccurredWaitHandle;
|
|
|
array[1] = _sessionDisconnectedWaitHandle;
|
|
|
array[2] = _channelClosedWaitHandle;
|
|
|
|
|
|
@@ -490,7 +490,7 @@ namespace Renci.SshNet
|
|
|
SignalDisconnected();
|
|
|
}
|
|
|
|
|
|
- private void Session_ErrorOccured(object sender, ExceptionEventArgs e)
|
|
|
+ private void Session_ErrorOccurred(object sender, ExceptionEventArgs e)
|
|
|
{
|
|
|
RaiseError(e.Exception);
|
|
|
}
|
|
|
@@ -528,7 +528,7 @@ namespace Renci.SshNet
|
|
|
}
|
|
|
|
|
|
session.Disconnected -= Session_Disconnected;
|
|
|
- session.ErrorOccured -= Session_ErrorOccured;
|
|
|
+ session.ErrorOccured -= Session_ErrorOccurred;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -557,11 +557,11 @@ namespace Renci.SshNet
|
|
|
|
|
|
_session = null;
|
|
|
|
|
|
- var errorOccuredWaitHandle = _errorOccuredWaitHandle;
|
|
|
- if (errorOccuredWaitHandle != null)
|
|
|
+ var errorOccurredWaitHandle = _errorOccurredWaitHandle;
|
|
|
+ if (errorOccurredWaitHandle != null)
|
|
|
{
|
|
|
- _errorOccuredWaitHandle = null;
|
|
|
- errorOccuredWaitHandle.Dispose();
|
|
|
+ _errorOccurredWaitHandle = null;
|
|
|
+ errorOccurredWaitHandle.Dispose();
|
|
|
}
|
|
|
|
|
|
var sessionDisconnectedWaitHandle = _sessionDisconnectedWaitHandle;
|