smb: cleaner server component parsing

diff --git a/rust/src/smb/smb1_records.rs b/rust/src/smb/smb1_records.rs
index 13bae3e3346d38bdef0f9efc7876cd7406c031c0..278933dc6cfa6bb08f843d63f7a2edcde8770942 100644 (file)
--- a/rust/src/smb/smb1_records.rs
+++ b/rust/src/smb/smb1_records.rs
@@ -588,17 +588,14 @@ named!(pub parse_smb1_close_request_record<SmbRequestCloseRecord>,
 #[derive(Debug,PartialEq)]
 pub struct SmbVersion<> {
     pub version: u8,
-//    pub data: &'a[u8],
 }
 
 named!(pub parse_smb_version<SmbVersion>,
     do_parse!(
         version: le_u8
         >> tag!("SMB")
-//        >> data: rest
         >> (SmbVersion {
                 version:version,
-//                data:data,
             }))
 );
 
@@ -625,7 +622,7 @@ pub struct SmbRecord<'a> {
 
 named!(pub parse_smb_record<SmbRecord>,
     do_parse!(
-            server_component:take!(4) // ff SMB
+            server_component: tag!(b"\xffSMB")
         >>  command:le_u8
         >>  nt_status:le_u32
         >>  flags:le_u8

diff --git a/rust/src/smb/smb2_records.rs b/rust/src/smb/smb2_records.rs
index 702466861898a994e6ee8f16a7b7ec7da5133283..3ee2430e0f059de06ff17078ad6ce52f390eb2f4 100644 (file)
--- a/rust/src/smb/smb2_records.rs
+++ b/rust/src/smb/smb2_records.rs
@@ -43,7 +43,7 @@ pub struct Smb2Record<'a> {
 
 named!(pub parse_smb2_request_record<Smb2Record>,
     do_parse!(
-            server_component:take!(4) // fe SMB
+            server_component: tag!(b"\xfeSMB")
         >>  hlen: le_u16
         >>  credit_charge: le_u16
         >>  channel_seq: le_u16
@@ -368,7 +368,7 @@ named!(pub parse_smb2_response_write<Smb2WriteResponseRecord>,
 
 named!(pub parse_smb2_response_record<Smb2Record>,
     do_parse!(
-            server_component:take!(4) // fe SMB
+            server_component: tag!(b"\xfeSMB")
         >>  hlen: le_u16
         >>  credit_charge: le_u16
         >>  nt_status: le_u32