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

SMB_COM_OPEN_ANDX request and response: Implemented client related functionality

Browse source
This commit is contained in:
Tal Aloni 2017-12-08 14:33:08 +02:00
parent 84a771641e
commit 7159909bc9
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
SMBLibrary/SMB1/Commands/OpenAndXRequest.cs
View file

@ -18,9 +18,9 @@ namespace SMBLibrary.SMB1
{ {
public const int ParametersLength = 30; public const int ParametersLength = 30;
// Parameters: // Parameters:
//CommandName AndXCommand; // CommandName AndXCommand;
//byte AndXReserved; // byte AndXReserved;
//ushort AndXOffset; // ushort AndXOffset;
public OpenFlags Flags; public OpenFlags Flags;
public AccessModeOptions AccessMode; public AccessModeOptions AccessMode;
public SMBFileAttributes SearchAttrs; public SMBFileAttributes SearchAttrs;
@ -60,7 +60,31 @@ namespace SMBLibrary.SMB1
public override byte[] GetBytes(bool isUnicode) public override byte[] GetBytes(bool isUnicode)
{ {
throw new NotImplementedException(); this.SMBParameters = new byte[ParametersLength];
int parametersOffset = 4;
LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)Flags);
AccessMode.WriteBytes(this.SMBParameters, ref parametersOffset);
LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)SearchAttrs);
LittleEndianWriter.WriteUInt16(this.SMBParameters, ref parametersOffset, (ushort)FileAttrs);
UTimeHelper.WriteUTime(this.SMBParameters, ref parametersOffset, CreationTime);
OpenMode.WriteBytes(this.SMBParameters, ref parametersOffset);
LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, AllocationSize);
LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, Timeout);
LittleEndianWriter.WriteUInt32(this.SMBParameters, ref parametersOffset, Reserved);
int padding = 0;
if (isUnicode)
{
padding = 1;
this.SMBData = new byte[padding + FileName.Length * 2 + 2];
}
else
{
this.SMBData = new byte[FileName.Length + 1];
}
SMB1Helper.WriteSMBString(this.SMBData, padding, isUnicode, FileName);
return base.GetBytes(isUnicode);
} }
public override CommandName CommandName public override CommandName CommandName

17
SMBLibrary/SMB1/Commands/OpenAndXResponse.cs
View file

@ -18,9 +18,9 @@ namespace SMBLibrary.SMB1
{ {
public const int ParametersLength = 30; public const int ParametersLength = 30;
// Parameters: // Parameters:
//CommandName AndXCommand; // CommandName AndXCommand;
//byte AndXReserved; // byte AndXReserved;
//ushort AndXOffset; // ushort AndXOffset;
public ushort FID; public ushort FID;
public SMBFileAttributes FileAttrs; public SMBFileAttributes FileAttrs;
public DateTime? LastWriteTime; // UTime public DateTime? LastWriteTime; // UTime
@ -38,7 +38,16 @@ namespace SMBLibrary.SMB1
public OpenAndXResponse(byte[] buffer, int offset) : base(buffer, offset, false) public OpenAndXResponse(byte[] buffer, int offset) : base(buffer, offset, false)
{ {
throw new NotImplementedException(); int parametersOffset = 4;
FID = LittleEndianReader.ReadUInt16(this.SMBParameters, ref parametersOffset);
FileAttrs = (SMBFileAttributes)LittleEndianReader.ReadUInt16(this.SMBParameters, ref parametersOffset);
LastWriteTime = UTimeHelper.ReadNullableUTime(this.SMBParameters, ref parametersOffset);
FileDataSize = LittleEndianReader.ReadUInt32(this.SMBParameters, ref parametersOffset);
AccessRights = (AccessRights)LittleEndianReader.ReadUInt16(this.SMBParameters, ref parametersOffset);
ResourceType = (ResourceType)LittleEndianReader.ReadUInt16(this.SMBParameters, ref parametersOffset);
NMPipeStatus = NamedPipeStatus.Read(this.SMBParameters, ref parametersOffset);
OpenResults = OpenResults.Read(this.SMBParameters, ref parametersOffset);
Reserved = ByteReader.ReadBytes(this.SMBParameters, ref parametersOffset, 6);
} }
public override byte[] GetBytes(bool isUnicode) public override byte[] GetBytes(bool isUnicode)

4
SMBLibrary/SMB1/Commands/SMB1Command.cs
View file

@ -305,11 +305,11 @@ namespace SMBLibrary.SMB1
{ {
if (wordCount * 2 == OpenAndXResponse.ParametersLength) if (wordCount * 2 == OpenAndXResponse.ParametersLength)
{ {
throw new NotImplementedException(); return new OpenAndXResponse(buffer, offset);
} }
else if (wordCount * 2 == OpenAndXResponseExtended.ParametersLength) else if (wordCount * 2 == OpenAndXResponseExtended.ParametersLength)
{ {
throw new NotImplementedException(); return new OpenAndXResponseExtended(buffer, offset);
} }
else if (wordCount == 0) else if (wordCount == 0)
{ {