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

TransactionRequest: Improved GetBytes implementation

Browse source
This commit is contained in:
Tal Aloni 2017-02-02 22:58:23 +02:00
parent d3a0a290c5
commit dfbf01d538
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
SMBLibrary/SMB1/Commands/TransactionRequest.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,
@ -97,7 +97,6 @@ namespace SMBLibrary.SMB1
ushort ParameterOffset = (ushort)(SMB1Header.Length + 3 + (FixedSMBParametersLength + Setup.Length)); ushort ParameterOffset = (ushort)(SMB1Header.Length + 3 + (FixedSMBParametersLength + Setup.Length));
if (this is Transaction2Request) if (this is Transaction2Request)
{ {
ParameterOffset += 1;
} }
else else
{ {
@ -138,7 +137,7 @@ namespace SMBLibrary.SMB1
if (this is Transaction2Request) if (this is Transaction2Request)
{ {
offset = 0; offset = 0;
this.SMBData = new byte[1 + ParameterCount + DataCount + padding1 + padding2]; this.SMBData = new byte[padding1 + ParameterCount + padding2 + DataCount];
} }
else else
{ {
@ -146,15 +145,15 @@ namespace SMBLibrary.SMB1
{ {
int namePadding = 1; int namePadding = 1;
offset = namePadding; offset = namePadding;
this.SMBData = new byte[namePadding + Name.Length * 2 + 2 + ParameterCount + DataCount + padding1 + padding2]; this.SMBData = new byte[namePadding + Name.Length * 2 + 2 + padding1 + ParameterCount + padding2 + DataCount];
} }
else else
{ {
offset = 0; offset = 0;
this.SMBData = new byte[Name.Length + 1 + ParameterCount + DataCount + padding1 + padding2]; this.SMBData = new byte[Name.Length + 1 + padding1 + ParameterCount + padding2 + DataCount];
} }
SMB1Helper.WriteSMBString(this.SMBData, ref offset, isUnicode, Name);
} }
SMB1Helper.WriteSMBString(this.SMBData, ref offset, isUnicode, Name);
ByteWriter.WriteBytes(this.SMBData, offset + padding1, TransParameters); ByteWriter.WriteBytes(this.SMBData, offset + padding1, TransParameters);
ByteWriter.WriteBytes(this.SMBData, offset + padding1 + ParameterCount + padding2, TransData); ByteWriter.WriteBytes(this.SMBData, offset + padding1 + ParameterCount + padding2, TransData);