zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-31 01:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB1: Minor implementation improvements

Browse source
This commit is contained in:
Tal Aloni 2017-09-01 18:38:42 +03:00
parent 320a4cb969
commit b3445530ac
6 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,8 +27,8 @@ namespace SMBLibrary.SMB1
public ServerCapabilities Capabilities; public ServerCapabilities Capabilities;
// Data: // Data:
public byte[] SecurityBlob; public byte[] SecurityBlob;
public string NativeOS; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeOS = String.Empty; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header)
public string NativeLanMan; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeLanMan = String.Empty; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header)
public SessionSetupAndXRequestExtended(): base() public SessionSetupAndXRequestExtended(): base()
{ {

9
SMBLibrary/SMB1/Commands/SessionSetupAndXResponse.cs
View file

@ -11,6 +11,9 @@ using Utilities;
namespace SMBLibrary.SMB1 namespace SMBLibrary.SMB1
{ {
/// <summary>
/// SMB_COM_SESSION_SETUP_ANDX Response
/// </summary>
public class SessionSetupAndXResponse : SMBAndXCommand public class SessionSetupAndXResponse : SMBAndXCommand
{ {
public const int ParametersLength = 6; public const int ParametersLength = 6;
@ -20,9 +23,9 @@ namespace SMBLibrary.SMB1
//ushort AndXOffset; //ushort AndXOffset;
public SessionSetupAction Action; public SessionSetupAction Action;
// Data: // Data:
public string NativeOS; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeOS = String.Empty; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header)
public string NativeLanMan; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeLanMan = String.Empty; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header)
public string PrimaryDomain; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header) public string PrimaryDomain = String.Empty; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header)
public SessionSetupAndXResponse() : base() public SessionSetupAndXResponse() : base()
{ {

9
SMBLibrary/SMB1/Commands/SessionSetupAndXResponseExtended.cs
View file

@ -11,6 +11,9 @@ using Utilities;
namespace SMBLibrary.SMB1 namespace SMBLibrary.SMB1
{ {
/// <summary>
/// SMB_COM_SESSION_SETUP_ANDX Response, NT LAN Manager dialect, Extended Security response
/// </summary>
public class SessionSetupAndXResponseExtended : SMBAndXCommand public class SessionSetupAndXResponseExtended : SMBAndXCommand
{ {
public const int ParametersLength = 8; public const int ParametersLength = 8;
@ -22,14 +25,12 @@ namespace SMBLibrary.SMB1
private ushort SecurityBlobLength; private ushort SecurityBlobLength;
// Data: // Data:
public byte[] SecurityBlob; public byte[] SecurityBlob;
public string NativeOS; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeOS = String.Empty; // SMB_STRING (If Unicode, this field MUST be aligned to start on a 2-byte boundary from the start of the SMB header)
public string NativeLanMan; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header) public string NativeLanMan = String.Empty; // SMB_STRING (this field WILL be aligned to start on a 2-byte boundary from the start of the SMB header)
public SessionSetupAndXResponseExtended() : base() public SessionSetupAndXResponseExtended() : base()
{ {
SecurityBlob = new byte[0]; SecurityBlob = new byte[0];
NativeOS = String.Empty;
NativeLanMan = String.Empty;
} }
public SessionSetupAndXResponseExtended(byte[] buffer, int offset, bool isUnicode) : base(buffer, offset, isUnicode) public SessionSetupAndXResponseExtended(byte[] buffer, int offset, bool isUnicode) : base(buffer, offset, isUnicode)

2
SMBLibrary/SMB1/Commands/WriteRawFinalResponse.cs
View file

@ -16,7 +16,7 @@ namespace SMBLibrary.SMB1
/// </summary> /// </summary>
public class WriteRawFinalResponse : SMB1Command public class WriteRawFinalResponse : SMB1Command
{ {
public ushort ParametersLength = 2; public const ushort ParametersLength = 2;
// Parameters; // Parameters;
public ushort Count; public ushort Count;

2
SMBLibrary/SMB1/Commands/WriteRawInterimResponse.cs
View file

@ -16,7 +16,7 @@ namespace SMBLibrary.SMB1
/// </summary> /// </summary>
public class WriteRawInterimResponse : SMB1Command public class WriteRawInterimResponse : SMB1Command
{ {
public ushort ParametersLength = 2; public const ushort ParametersLength = 2;
// Parameters; // Parameters;
public ushort Available; public ushort Available;

11
SMBLibrary/SMB1/SMB1Header.cs
View file

@ -114,6 +114,17 @@ namespace SMBLibrary.SMB1
{ {
return (Flags2 & HeaderFlags2.Unicode) > 0; return (Flags2 & HeaderFlags2.Unicode) > 0;
} }
set
{
if (value)
{
this.Flags2 |= HeaderFlags2.Unicode;
}
else
{
this.Flags2 &= ~HeaderFlags2.Unicode;
}
}
} }
public static bool IsValidSMB1Header(byte[] buffer) public static bool IsValidSMB1Header(byte[] buffer)