zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-15 17:06:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB1: Corrected SMB_COM_NT_CREATE_ANDX implementation

Browse source
This commit is contained in:
Tal Aloni 2017-09-05 20:21:01 +03:00
parent d98ed6c2b0
commit 1df1cc1b8a
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
SMBLibrary/SMB1/Commands/NTCreateAndXRequest.cs
View file

@ -18,11 +18,11 @@ namespace SMBLibrary.SMB1
{ {
public const int ParametersLength = 48; public const int ParametersLength = 48;
// Parameters: // Parameters:
//CommandName AndXCommand; // CommandName AndXCommand;
//byte AndXReserved; // byte AndXReserved;
//ushort AndXOffset; // ushort AndXOffset;
public byte Reserved; public byte Reserved;
private ushort NameLength; // in bytes // ushort NameLength; // in bytes
public NTCreateFlags Flags; public NTCreateFlags Flags;
public uint RootDirectoryFID; public uint RootDirectoryFID;
public FileAccessMask DesiredAccess; public FileAccessMask DesiredAccess;
@ -43,7 +43,7 @@ namespace SMBLibrary.SMB1
public NTCreateAndXRequest(byte[] buffer, int offset, bool isUnicode) : base(buffer, offset, isUnicode) public NTCreateAndXRequest(byte[] buffer, int offset, bool isUnicode) : base(buffer, offset, isUnicode)
{ {
Reserved = ByteReader.ReadByte(this.SMBParameters, 4); Reserved = ByteReader.ReadByte(this.SMBParameters, 4);
NameLength = LittleEndianConverter.ToUInt16(this.SMBParameters, 5); ushort nameLength = LittleEndianConverter.ToUInt16(this.SMBParameters, 5);
Flags = (NTCreateFlags)LittleEndianConverter.ToUInt32(this.SMBParameters, 7); Flags = (NTCreateFlags)LittleEndianConverter.ToUInt32(this.SMBParameters, 7);
RootDirectoryFID = LittleEndianConverter.ToUInt32(this.SMBParameters, 11); RootDirectoryFID = LittleEndianConverter.ToUInt32(this.SMBParameters, 11);
DesiredAccess = (FileAccessMask)LittleEndianConverter.ToUInt32(this.SMBParameters, 15); DesiredAccess = (FileAccessMask)LittleEndianConverter.ToUInt32(this.SMBParameters, 15);
@ -67,13 +67,17 @@ namespace SMBLibrary.SMB1
public override byte[] GetBytes(bool isUnicode) public override byte[] GetBytes(bool isUnicode)
{ {
NameLength = (ushort)FileName.Length; ushort nameLength = (ushort)FileName.Length;
if (isUnicode)
{
nameLength *= 2;
}
this.SMBParameters = new byte[ParametersLength]; this.SMBParameters = new byte[ParametersLength];
ByteWriter.WriteByte(this.SMBParameters, 0, (byte)AndXCommand); ByteWriter.WriteByte(this.SMBParameters, 0, (byte)AndXCommand);
ByteWriter.WriteByte(this.SMBParameters, 1, AndXReserved); ByteWriter.WriteByte(this.SMBParameters, 1, AndXReserved);
LittleEndianWriter.WriteUInt16(this.SMBParameters, 2, AndXOffset); LittleEndianWriter.WriteUInt16(this.SMBParameters, 2, AndXOffset);
ByteWriter.WriteByte(this.SMBParameters, 4, Reserved); ByteWriter.WriteByte(this.SMBParameters, 4, Reserved);
LittleEndianWriter.WriteUInt16(this.SMBParameters, 5, NameLength); LittleEndianWriter.WriteUInt16(this.SMBParameters, 5, nameLength);
LittleEndianWriter.WriteUInt32(this.SMBParameters, 7, (uint)Flags); LittleEndianWriter.WriteUInt32(this.SMBParameters, 7, (uint)Flags);
LittleEndianWriter.WriteUInt32(this.SMBParameters, 11, RootDirectoryFID); LittleEndianWriter.WriteUInt32(this.SMBParameters, 11, RootDirectoryFID);
LittleEndianWriter.WriteUInt32(this.SMBParameters, 15, (uint)DesiredAccess); LittleEndianWriter.WriteUInt32(this.SMBParameters, 15, (uint)DesiredAccess);