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

All matching opened files will now be closed during tree disconnect

Browse source
This commit is contained in:
Tal Aloni 2017-03-04 14:10:16 +02:00
parent 2c1b59973b
commit cff82dd4b8
4 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SMBLibrary/Server/ConnectionState/SMB1Session.cs
View file

@ -57,10 +57,25 @@ namespace SMBLibrary.Server
return share; return share;
} }
public void RemoveConnectedTree(ushort treeID) public void DisconnectTree(ushort treeID)
{ {
ISMBShare share;
m_connectedTrees.TryGetValue(treeID, out share);
if (share != null)
{
List<ushort> fileIDList = new List<ushort>(m_openFiles.Keys);
foreach (ushort fileID in fileIDList)
{
OpenFileObject openFile = m_openFiles[fileID];
if (openFile.TreeID == treeID)
{
share.FileStore.CloseFile(openFile.Handle);
m_openFiles.Remove(fileID);
}
}
m_connectedTrees.Remove(treeID); m_connectedTrees.Remove(treeID);
} }
}
public bool IsTreeConnected(ushort treeID) public bool IsTreeConnected(ushort treeID)
{ {

20
SMBLibrary/Server/ConnectionState/SMB2Session.cs
View file

@ -79,14 +79,24 @@ namespace SMBLibrary.Server
} }
} }
public void RemoveConnectedTree(uint treeID) public void DisconnectTree(uint treeID)
{ {
ISMBShare share;
m_connectedTrees.TryGetValue(treeID, out share);
if (share != null)
{
List<ulong> fileIDList = new List<ulong>(m_openFiles.Keys);
foreach (ushort fileID in fileIDList)
{
OpenFileObject openFile = m_openFiles[fileID];
if (openFile.TreeID == treeID)
{
share.FileStore.CloseFile(openFile.Handle);
m_openFiles.Remove(fileID);
}
}
m_connectedTrees.Remove(treeID); m_connectedTrees.Remove(treeID);
} }
public void RemoveConnectedTrees()
{
m_connectedTrees.Clear();
} }
public bool IsTreeConnected(uint treeID) public bool IsTreeConnected(uint treeID)

2
SMBLibrary/Server/SMB1/TreeConnectHelper.cs
View file

@ -98,7 +98,7 @@ namespace SMBLibrary.Server.SMB1
return new ErrorResponse(request.CommandName); return new ErrorResponse(request.CommandName);
} }
session.RemoveConnectedTree(header.TID); session.DisconnectTree(header.TID);
return new TreeDisconnectResponse(); return new TreeDisconnectResponse();
} }
} }

2
SMBLibrary/Server/SMBServer.SMB2.cs
View file

@ -158,7 +158,7 @@ namespace SMBLibrary.Server
if (command is TreeDisconnectRequest) if (command is TreeDisconnectRequest)
{ {
session.RemoveConnectedTree(command.Header.TreeID); session.DisconnectTree(command.Header.TreeID);
return new TreeDisconnectResponse(); return new TreeDisconnectResponse();
} }
else if (command is CreateRequest) else if (command is CreateRequest)