zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-10 23:38:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Client: Fixed a bug related to localhost communication

Browse source
This commit is contained in:
Tal Aloni 2019-08-10 21:22:41 +03:00
parent a0a372dd16
commit 2caf390c41
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SMBLibrary/Client/SMB1Client.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014-2018 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2019 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -31,7 +31,6 @@ namespace SMBLibrary.Client
private bool m_isConnected; private bool m_isConnected;
private bool m_isLoggedIn; private bool m_isLoggedIn;
private Socket m_clientSocket; private Socket m_clientSocket;
private IAsyncResult m_currentAsyncResult;
private bool m_forceExtendedSecurity; private bool m_forceExtendedSecurity;
private bool m_unicode; private bool m_unicode;
private bool m_largeFiles; private bool m_largeFiles;
@ -87,7 +86,7 @@ namespace SMBLibrary.Client
ConnectionState state = new ConnectionState(); ConnectionState state = new ConnectionState();
NBTConnectionReceiveBuffer buffer = state.ReceiveBuffer; NBTConnectionReceiveBuffer buffer = state.ReceiveBuffer;
m_currentAsyncResult = m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state); m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state);
bool supportsDialect = NegotiateDialect(m_forceExtendedSecurity); bool supportsDialect = NegotiateDialect(m_forceExtendedSecurity);
if (!supportsDialect) if (!supportsDialect)
{ {
@ -358,13 +357,6 @@ namespace SMBLibrary.Client
private void OnClientSocketReceive(IAsyncResult ar) private void OnClientSocketReceive(IAsyncResult ar)
{ {
if (ar != m_currentAsyncResult)
{
// We ignore calls for old sockets which we no longer use
// See: http://rajputyh.blogspot.co.il/2010/04/solve-exception-message-iasyncresult.html
return;
}
ConnectionState state = (ConnectionState)ar.AsyncState; ConnectionState state = (ConnectionState)ar.AsyncState;
if (!m_clientSocket.Connected) if (!m_clientSocket.Connected)
@ -377,6 +369,10 @@ namespace SMBLibrary.Client
{ {
numberOfBytesReceived = m_clientSocket.EndReceive(ar); numberOfBytesReceived = m_clientSocket.EndReceive(ar);
} }
catch (ArgumentException) // The IAsyncResult object was not returned from the corresponding synchronous method on this class.
{
return;
}
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
Log("[ReceiveCallback] EndReceive ObjectDisposedException"); Log("[ReceiveCallback] EndReceive ObjectDisposedException");
@ -400,7 +396,7 @@ namespace SMBLibrary.Client
try try
{ {
m_currentAsyncResult = m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state); m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state);
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {

16
SMBLibrary/Client/SMB2Client.cs
View file

@ -32,7 +32,6 @@ namespace SMBLibrary.Client
private bool m_isConnected; private bool m_isConnected;
private bool m_isLoggedIn; private bool m_isLoggedIn;
private Socket m_clientSocket; private Socket m_clientSocket;
private IAsyncResult m_currentAsyncResult;
private object m_incomingQueueLock = new object(); private object m_incomingQueueLock = new object();
private List<SMB2Command> m_incomingQueue = new List<SMB2Command>(); private List<SMB2Command> m_incomingQueue = new List<SMB2Command>();
@ -79,7 +78,7 @@ namespace SMBLibrary.Client
ConnectionState state = new ConnectionState(); ConnectionState state = new ConnectionState();
NBTConnectionReceiveBuffer buffer = state.ReceiveBuffer; NBTConnectionReceiveBuffer buffer = state.ReceiveBuffer;
m_currentAsyncResult = m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state); m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state);
bool supportsDialect = NegotiateDialect(); bool supportsDialect = NegotiateDialect();
if (!supportsDialect) if (!supportsDialect)
{ {
@ -246,13 +245,6 @@ namespace SMBLibrary.Client
private void OnClientSocketReceive(IAsyncResult ar) private void OnClientSocketReceive(IAsyncResult ar)
{ {
if (ar != m_currentAsyncResult)
{
// We ignore calls for old sockets which we no longer use
// See: http://rajputyh.blogspot.co.il/2010/04/solve-exception-message-iasyncresult.html
return;
}
ConnectionState state = (ConnectionState)ar.AsyncState; ConnectionState state = (ConnectionState)ar.AsyncState;
if (!m_clientSocket.Connected) if (!m_clientSocket.Connected)
@ -265,6 +257,10 @@ namespace SMBLibrary.Client
{ {
numberOfBytesReceived = m_clientSocket.EndReceive(ar); numberOfBytesReceived = m_clientSocket.EndReceive(ar);
} }
catch (ArgumentException) // The IAsyncResult object was not returned from the corresponding synchronous method on this class.
{
return;
}
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
Log("[ReceiveCallback] EndReceive ObjectDisposedException"); Log("[ReceiveCallback] EndReceive ObjectDisposedException");
@ -288,7 +284,7 @@ namespace SMBLibrary.Client
try try
{ {
m_currentAsyncResult = m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state); m_clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state);
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {