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

Improved SID (search handle) allocation mechanism

Browse source
This commit is contained in:
Tal Aloni 2017-01-13 11:19:46 +02:00
parent 86c50e45fd
commit b12a340d70
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -270,16 +270,23 @@ namespace SMBLibrary.Server
} }
} }
public ushort AllocateSearchHandle() public ushort? AllocateSearchHandle()
{ {
while (OpenSearches.ContainsKey(m_nextSearchHandle) || m_nextSearchHandle == 0 || m_nextSearchHandle == 0xFFFF) for (ushort offset = 0; offset < UInt16.MaxValue; offset++)
{ {
m_nextSearchHandle++; ushort searchHandle = (ushort)(m_nextSearchHandle + offset);
if (searchHandle == 0 || searchHandle == 0xFFFF)
{
continue;
} }
ushort searchHandle = m_nextSearchHandle; if (!OpenSearches.ContainsKey(searchHandle))
m_nextSearchHandle++; {
m_nextSearchHandle = (ushort)(searchHandle + 1);
return searchHandle; return searchHandle;
} }
}
return null;
}
public void ReleaseSearchHandle(ushort searchHandle) public void ReleaseSearchHandle(ushort searchHandle)
{ {

14
SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
View file

@ -40,12 +40,6 @@ namespace SMBLibrary.Server.SMB1
} }
bool exactNameWithoutExtension = searchPattern.Contains("\""); bool exactNameWithoutExtension = searchPattern.Contains("\"");
if (state.OpenSearches.Count > SMB1ConnectionState.MaxSearches)
{
header.Status = NTStatus.STATUS_OS2_NO_MORE_SIDS;
return null;
}
FileSystemEntry entry = fileSystem.GetEntry(path); FileSystemEntry entry = fileSystem.GetEntry(path);
if (entry == null) if (entry == null)
{ {
@ -128,7 +122,13 @@ namespace SMBLibrary.Server.SMB1
} }
else else
{ {
response.SID = state.AllocateSearchHandle(); ushort? searchHandle = state.AllocateSearchHandle();
if (!searchHandle.HasValue)
{
header.Status = NTStatus.STATUS_OS2_NO_MORE_SIDS;
return null;
}
response.SID = searchHandle.Value;
entries.RemoveRange(0, returnCount); entries.RemoveRange(0, returnCount);
state.OpenSearches.Add(response.SID, entries); state.OpenSearches.Add(response.SID, entries);
} }