GithubStar/SSH.NET
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-10-28 22:49:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanup of SftpFileStream.

Browse Source
This commit is contained in:
olegkap_cp
2012-12-20 19:33:19 +00:00
parent 43358247a5
commit ef584b16f6
3 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Renci.SshClient/Renci.SshNet/Sftp/SftpFileStream.cs
+32 -11
View File
@@ -5,6 +5,7 @@ using System.Text;
using System.IO;
using System.Threading;
using System.Diagnostics.CodeAnalysis;
using Renci.SshNet.Common;
namespace Renci.SshNet.Sftp
{
@@ -240,6 +241,7 @@ namespace Renci.SshNet.Sftp
this._bufferOwnedByWrite = false;
this._canSeek = true;
this._position = 0;
this._session.Disconnected += Session_Disconnected;
var flags = Flags.None;
@@ -487,9 +489,9 @@ namespace Renci.SshNet.Sftp
this._bufferPosn = 0;
var data = this._session.RequestRead(this._handle, (ulong)this.Position, (uint)this._bufferSize);
this._bufferLen = data.Length;
Buffer.BlockCopy(data, 0, this._buffer, 0, this._bufferLen);
if (this._bufferLen < 0)
@@ -902,20 +904,30 @@ namespace Renci.SshNet.Sftp
{
base.Dispose(disposing);
lock (this._lock)
if (this._session != null)
{
if (this._handle != null)
lock (this._lock)
{
if (this._bufferOwnedByWrite)
if (this._session != null)
{
this.FlushWriteBuffer();
}
if (this._handle != null)
{
if (this._bufferOwnedByWrite)
{
this.FlushWriteBuffer();
}
if (this._ownsHandle)
{
this._session.RequestClose(this._handle);
if (this._ownsHandle)
{
this._session.RequestClose(this._handle);
}
this._handle = null;
}
this._session.Disconnected -= Session_Disconnected;
this._session = null;
}
this._handle = null;
}
}
}
@@ -995,5 +1007,14 @@ namespace Renci.SshNet.Sftp
this._bufferOwnedByWrite = true;
}
}
private void Session_Disconnected(object sender, EventArgs e)
{
lock (this._lock)
{
this._session.Disconnected -= Session_Disconnected;
this._session = null;
}
}
}
}
Renci.SshClient/Renci.SshNet/ShellStream.cs
+6
View File
@@ -480,6 +480,12 @@ namespace Renci.SshNet
this._channel.Dispose();
this._channel = null;
}
if (this._session != null)
{
this._session.Disconnected -= new EventHandler<EventArgs>(Session_Disconnected);
this._session.ErrorOccured -= new EventHandler<ExceptionEventArgs>(Session_ErrorOccured);
}
}
private void Session_ErrorOccured(object sender, ExceptionEventArgs e)
Renci.SshClient/Renci.SshNet/SubsystemSession.cs
+10
View File
@@ -39,6 +39,11 @@ namespace Renci.SshNet.Sftp
/// </summary>
public event EventHandler<ExceptionEventArgs> ErrorOccurred;
/// <summary>
/// Occurs when session has been disconnected form the server.
/// </summary>
public event EventHandler<EventArgs> Disconnected;
/// <summary>
/// Gets the channel number.
/// </summary>
@@ -161,6 +166,11 @@ namespace Renci.SshNet.Sftp
private void Session_Disconnected(object sender, EventArgs e)
{
if (this.Disconnected != null)
{
this.Disconnected(this, new EventArgs());
}
this.RaiseError(new SshException("Connection was lost"));
}