update sharpcifs

This commit is contained in:
Luke Pulverenti
2017-07-07 23:12:21 -04:00
parent a30e22c3a2
commit 0d10dfe471
221 changed files with 23704 additions and 25614 deletions

View File

@@ -108,7 +108,8 @@ namespace SharpCifs.Smb
return 0;
}
internal override int ReadParameterWordsWireFormat(byte[] buffer, int bufferIndex)
internal override int ReadParameterWordsWireFormat(byte[] buffer, int bufferIndex
)
{
int start = bufferIndex;
TotalParameterCount = ReadInt2(buffer, bufferIndex);
@@ -151,30 +152,22 @@ namespace SharpCifs.Smb
if (ParameterCount > 0)
{
bufferIndex += _pad = ParameterOffset - (bufferIndex - HeaderStart);
Array.Copy(buffer,
bufferIndex,
TxnBuf,
BufParameterStart + ParameterDisplacement,
ParameterCount);
Array.Copy(buffer, bufferIndex, TxnBuf, BufParameterStart + ParameterDisplacement
, ParameterCount);
bufferIndex += ParameterCount;
}
if (DataCount > 0)
{
bufferIndex += _pad1 = DataOffset - (bufferIndex - HeaderStart);
Array.Copy(buffer,
bufferIndex,
TxnBuf,
BufDataStart + DataDisplacement,
DataCount);
Array.Copy(buffer, bufferIndex, TxnBuf, BufDataStart + DataDisplacement,
DataCount);
bufferIndex += DataCount;
}
if (!_parametersDone
&& (ParameterDisplacement + ParameterCount) == TotalParameterCount)
if (!_parametersDone && (ParameterDisplacement + ParameterCount) == TotalParameterCount)
{
_parametersDone = true;
}
if (!_dataDone
&& (DataDisplacement + DataCount) == TotalDataCount)
if (!_dataDone && (DataDisplacement + DataCount) == TotalDataCount)
{
_dataDone = true;
}
@@ -193,26 +186,21 @@ namespace SharpCifs.Smb
internal abstract int WriteDataWireFormat(byte[] dst, int dstIndex);
internal abstract int ReadSetupWireFormat(byte[] buffer, int bufferIndex, int len);
internal abstract int ReadSetupWireFormat(byte[] buffer, int bufferIndex, int len
);
internal abstract int ReadParametersWireFormat(byte[] buffer, int bufferIndex, int len);
internal abstract int ReadParametersWireFormat(byte[] buffer, int bufferIndex, int
len);
internal abstract int ReadDataWireFormat(byte[] buffer, int bufferIndex, int len);
public override string ToString()
{
return base.ToString()
+ ",totalParameterCount=" + TotalParameterCount
+ ",totalDataCount=" + TotalDataCount
+ ",parameterCount=" + ParameterCount
+ ",parameterOffset=" + ParameterOffset
+ ",parameterDisplacement=" + ParameterDisplacement
+ ",dataCount=" + DataCount
+ ",dataOffset=" + DataOffset
+ ",dataDisplacement=" + DataDisplacement
+ ",setupCount=" + SetupCount
+ ",pad=" + _pad
+ ",pad1=" + _pad1;
return base.ToString() + ",totalParameterCount=" + TotalParameterCount
+ ",totalDataCount=" + TotalDataCount + ",parameterCount=" + ParameterCount + ",parameterOffset="
+ ParameterOffset + ",parameterDisplacement=" + ParameterDisplacement + ",dataCount="
+ DataCount + ",dataOffset=" + DataOffset + ",dataDisplacement=" + DataDisplacement
+ ",setupCount=" + SetupCount + ",pad=" + _pad + ",pad1=" + _pad1;
}
}
}