diff options
| author | Pavel Shilovsky <pshilov@microsoft.com> | 2016-10-24 15:33:04 -0700 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-02-01 16:46:34 -0600 |
| commit | 31473fc4f9653b73750d3792ffce6a6e1bdf0da7 (patch) | |
| tree | bb789f590f828d3da748de876a7fafa43e654e7a /fs/cifs/smb2pdu.h | |
| parent | 9c25702cee1405099f982894c865c163de7909a8 (diff) | |
CIFS: Separate SMB2 header structure
In order to support compounding and encryption we need to separate
RFC1001 length field and SMB2 header structure because the protocol
treats them differently. This change will allow to simplify parsing
of such complex SMB2 packets further.
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.h')
| -rw-r--r-- | fs/cifs/smb2pdu.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index dc0d141f33e2..8dd24b73d974 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -101,10 +101,7 @@ #define SMB2_HEADER_STRUCTURE_SIZE cpu_to_le16(64) -struct smb2_hdr { - __be32 smb2_buf_length; /* big endian on wire */ - /* length is only two or three bytes - with - one or two byte type preceding it that MBZ */ +struct smb2_sync_hdr { __le32 ProtocolId; /* 0xFE 'S' 'M' 'B' */ __le16 StructureSize; /* 64 */ __le16 CreditCharge; /* MBZ */ @@ -120,6 +117,13 @@ struct smb2_hdr { __u8 Signature[16]; } __packed; +struct smb2_hdr { + __be32 smb2_buf_length; /* big endian on wire */ + /* length is only two or three bytes - with */ + /* one or two byte type preceding it that MBZ */ + struct smb2_sync_hdr sync_hdr; +} __packed; + struct smb2_pdu { struct smb2_hdr hdr; __le16 StructureSize2; /* size of wct area (varies, request specific) */ |