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

Improved TID (TreeID) allocation mechanism

Browse source
This commit is contained in:
Tal Aloni 2017-01-13 14:19:42 +02:00
parent b12a340d70
commit 617e5fb854
3 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SMBLibrary/Enums/NTStatus.cs
View file

@ -27,6 +27,7 @@ namespace SMBLibrary
STATUS_FILE_IS_A_DIRECTORY = 0xC00000BA, STATUS_FILE_IS_A_DIRECTORY = 0xC00000BA,
STATUS_NOT_SUPPORTED = 0xC00000BB, STATUS_NOT_SUPPORTED = 0xC00000BB,
STATUS_CANNOT_DELETE = 0xC0000121, STATUS_CANNOT_DELETE = 0xC0000121,
STATUS_INSUFF_SERVER_RESOURCES = 0xC0000205,
STATUS_INVALID_SMB = 0x00010002, // CIFS/SMB1: A corrupt or invalid SMB request was received STATUS_INVALID_SMB = 0x00010002, // CIFS/SMB1: A corrupt or invalid SMB request was received
STATUS_SMB_BAD_COMMAND = 0x00160002, // CIFS/SMB1: An unknown SMB command code was received by the server STATUS_SMB_BAD_COMMAND = 0x00160002, // CIFS/SMB1: An unknown SMB command code was received by the server

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

@ -89,21 +89,31 @@ namespace SMBLibrary.Server
/// An open TID MUST be unique within an SMB connection. /// An open TID MUST be unique within an SMB connection.
/// The value 0xFFFF MUST NOT be used as a valid TID. All other possible values for TID, including zero (0x0000), are valid. /// The value 0xFFFF MUST NOT be used as a valid TID. All other possible values for TID, including zero (0x0000), are valid.
/// </summary> /// </summary>
private ushort AllocateTreeID() private ushort? AllocateTreeID()
{ {
while (m_connectedTrees.ContainsKey(m_nextTID) || m_nextTID == 0 || m_nextTID == 0xFFFF) for (ushort offset = 0; offset < UInt16.MaxValue; offset++)
{ {
m_nextTID++; ushort treeID = (ushort)(m_nextTID + offset);
if (treeID == 0 || treeID == 0xFFFF)
{
continue;
}
if (!m_connectedTrees.ContainsKey(treeID))
{
m_nextTID = (ushort)(treeID + 1);
return treeID;
}
} }
ushort treeID = m_nextTID; return null;
m_nextTID++;
return treeID;
} }
public ushort AddConnectedTree(string relativePath) public ushort? AddConnectedTree(string relativePath)
{ {
ushort treeID = AllocateTreeID(); ushort? treeID = AllocateTreeID();
m_connectedTrees.Add(treeID, relativePath); if (treeID.HasValue)
{
m_connectedTrees.Add(treeID.Value, relativePath);
}
return treeID; return treeID;
} }

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

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2017 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,
@ -20,7 +20,13 @@ namespace SMBLibrary.Server.SMB1
string relativePath = ServerPathUtils.GetRelativeServerPath(request.Path); string relativePath = ServerPathUtils.GetRelativeServerPath(request.Path);
if (String.Equals(relativePath, "\\IPC$", StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(relativePath, "\\IPC$", StringComparison.InvariantCultureIgnoreCase))
{ {
header.TID = state.AddConnectedTree(relativePath); ushort? treeID = state.AddConnectedTree(relativePath);
if (!treeID.HasValue)
{
header.Status = NTStatus.STATUS_INSUFF_SERVER_RESOURCES;
return new ErrorResponse(CommandName.SMB_COM_TREE_CONNECT_ANDX);
}
header.TID = treeID.Value;
if (isExtended) if (isExtended)
{ {
return CreateTreeConnectResponseExtended(ServiceName.NamedPipe); return CreateTreeConnectResponseExtended(ServiceName.NamedPipe);
@ -48,7 +54,13 @@ namespace SMBLibrary.Server.SMB1
} }
else else
{ {
header.TID = state.AddConnectedTree(relativePath); ushort? treeID = state.AddConnectedTree(relativePath);
if (!treeID.HasValue)
{
header.Status = NTStatus.STATUS_INSUFF_SERVER_RESOURCES;
return new ErrorResponse(CommandName.SMB_COM_TREE_CONNECT_ANDX);
}
header.TID = treeID.Value;
if (isExtended) if (isExtended)
{ {
return CreateTreeConnectResponseExtended(ServiceName.DiskShare); return CreateTreeConnectResponseExtended(ServiceName.DiskShare);