zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-04-30 10:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Added proper socket disconnecting sequence

Browse source 
* Fixed socket.EndReceive call
This commit is contained in:
raufismayilov 2024-05-29 12:29:33 +04:00
parent dd7b945ddc
commit 8870fe9acd
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
SMBLibrary/Client/SMB2Client.cs
View file

@ -35,6 +35,7 @@ namespace SMBLibrary.Client
private Socket m_clientSocket; private Socket m_clientSocket;
private ConnectionState m_connectionState; private ConnectionState m_connectionState;
private int m_responseTimeoutInMilliseconds; private int m_responseTimeoutInMilliseconds;
private EventWaitHandle m_disconnectedEventHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
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>();
@ -120,7 +121,7 @@ namespace SMBLibrary.Client
SessionPacket sessionResponsePacket = WaitForSessionResponsePacket(); SessionPacket sessionResponsePacket = WaitForSessionResponsePacket();
if (!(sessionResponsePacket is PositiveSessionResponsePacket)) if (!(sessionResponsePacket is PositiveSessionResponsePacket))
{ {
m_clientSocket.Disconnect(false); DisconnectSocket();
if (!ConnectSocket(serverAddress, port)) if (!ConnectSocket(serverAddress, port))
{ {
return false; return false;
@ -147,6 +148,7 @@ namespace SMBLibrary.Client
bool supportsDialect = NegotiateDialect(); bool supportsDialect = NegotiateDialect();
if (!supportsDialect) if (!supportsDialect)
{ {
DisconnectSocket();
m_clientSocket.Close(); m_clientSocket.Close();
} }
else else
@ -159,6 +161,7 @@ namespace SMBLibrary.Client
private bool ConnectSocket(IPAddress serverAddress, int port) private bool ConnectSocket(IPAddress serverAddress, int port)
{ {
m_disconnectedEventHandle.Reset();
m_clientSocket = new Socket(serverAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp); m_clientSocket = new Socket(serverAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
try try
@ -176,11 +179,18 @@ namespace SMBLibrary.Client
return true; return true;
} }
private void DisconnectSocket()
{
m_clientSocket.Shutdown(SocketShutdown.Send);
m_disconnectedEventHandle.WaitOne();
m_clientSocket.Shutdown(SocketShutdown.Receive);
}
public void Disconnect() public void Disconnect()
{ {
if (m_isConnected) if (m_isConnected)
{ {
m_clientSocket.Disconnect(false); DisconnectSocket();
m_clientSocket.Close(); m_clientSocket.Close();
m_connectionState.ReceiveBuffer.Dispose(); m_connectionState.ReceiveBuffer.Dispose();
m_isConnected = false; m_isConnected = false;
@ -357,12 +367,6 @@ namespace SMBLibrary.Client
ConnectionState state = (ConnectionState)ar.AsyncState; ConnectionState state = (ConnectionState)ar.AsyncState;
Socket clientSocket = state.ClientSocket; Socket clientSocket = state.ClientSocket;
if (!clientSocket.Connected)
{
state.ReceiveBuffer.Dispose();
return;
}
int numberOfBytesReceived = 0; int numberOfBytesReceived = 0;
try try
{ {
@ -371,18 +375,21 @@ namespace SMBLibrary.Client
catch (ArgumentException) // The IAsyncResult object was not returned from the corresponding synchronous method on this class. catch (ArgumentException) // The IAsyncResult object was not returned from the corresponding synchronous method on this class.
{ {
state.ReceiveBuffer.Dispose(); state.ReceiveBuffer.Dispose();
m_disconnectedEventHandle.Set();
return; return;
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
Log("[ReceiveCallback] EndReceive ObjectDisposedException"); Log("[ReceiveCallback] EndReceive ObjectDisposedException");
state.ReceiveBuffer.Dispose(); state.ReceiveBuffer.Dispose();
m_disconnectedEventHandle.Set();
return; return;
} }
catch (SocketException ex) catch (SocketException ex)
{ {
Log("[ReceiveCallback] EndReceive SocketException: " + ex.Message); Log("[ReceiveCallback] EndReceive SocketException: " + ex.Message);
state.ReceiveBuffer.Dispose(); state.ReceiveBuffer.Dispose();
m_disconnectedEventHandle.Set();
return; return;
} }
@ -390,6 +397,7 @@ namespace SMBLibrary.Client
{ {
m_isConnected = false; m_isConnected = false;
state.ReceiveBuffer.Dispose(); state.ReceiveBuffer.Dispose();
m_disconnectedEventHandle.Set();
} }
else else
{ {
@ -397,24 +405,23 @@ namespace SMBLibrary.Client
buffer.SetNumberOfBytesReceived(numberOfBytesReceived); buffer.SetNumberOfBytesReceived(numberOfBytesReceived);
ProcessConnectionBuffer(state); ProcessConnectionBuffer(state);
if (clientSocket.Connected) try
{ {
try clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state);
{ }
clientSocket.BeginReceive(buffer.Buffer, buffer.WriteOffset, buffer.AvailableLength, SocketFlags.None, new AsyncCallback(OnClientSocketReceive), state); catch (ObjectDisposedException)
} {
catch (ObjectDisposedException) m_isConnected = false;
{ Log("[ReceiveCallback] BeginReceive ObjectDisposedException");
m_isConnected = false; buffer.Dispose();
Log("[ReceiveCallback] BeginReceive ObjectDisposedException"); m_disconnectedEventHandle.Set();
buffer.Dispose(); }
} catch (SocketException ex)
catch (SocketException ex) {
{ m_isConnected = false;
m_isConnected = false; Log("[ReceiveCallback] BeginReceive SocketException: " + ex.Message);
Log("[ReceiveCallback] BeginReceive SocketException: " + ex.Message); buffer.Dispose();
buffer.Dispose(); m_disconnectedEventHandle.Set();
}
} }
} }
} }