rust: use the streaming version of combinators to fix incomplete reads

diff --git a/rust/src/dhcp/parser.rs b/rust/src/dhcp/parser.rs
index 3c82e466b7db57baa963180c9de450721812b6ea..f18aab389c22d07436443a1bba65150cb1f86e3e 100644 (file)
--- a/rust/src/dhcp/parser.rs
+++ b/rust/src/dhcp/parser.rs
@@ -20,7 +20,7 @@ use std::cmp::min;
 use crate::dhcp::dhcp::*;
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::{be_u8, be_u16, be_u32};
+use nom::number::streaming::{be_u8, be_u16, be_u32};
 
 pub struct DHCPMessage {
     pub header: DHCPHeader,

diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs
index ead5a6bcba383f43a742ad7b4aa85784e3c0ea6f..2a7825459e6216a565905cc777f05611724a76a4 100644 (file)
--- a/rust/src/dns/dns.rs
+++ b/rust/src/dns/dns.rs
@@ -26,7 +26,7 @@ use crate::core;
 use crate::dns::parser;
 
 use nom::IResult;
-use nom::number::complete::be_u16;
+use nom::number::streaming::be_u16;
 
 /// DNS record types.
 pub const DNS_RECORD_TYPE_A           : u16 = 1;

diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs
index fd4d3cba68a933a6f35711066c8cf67003a5b8ef..458f161083807ecfcacdb4a3e21ba6bea60ae9e3 100644 (file)
--- a/rust/src/dns/parser.rs
+++ b/rust/src/dns/parser.rs
@@ -20,7 +20,7 @@
 use nom::IResult;
 use nom::error::ErrorKind;
 use nom::multi::length_data;
-use nom::number::complete::{be_u8, be_u16, be_u32};
+use nom::number::streaming::{be_u8, be_u16, be_u32};
 use nom;
 use crate::dns::dns::*;
 

diff --git a/rust/src/kerberos.rs b/rust/src/kerberos.rs
index ff1370e1f2b38e1f8d75e18427d737ee90a106eb..c5730bd3bbe3179a120c0bc81c6cf5def016aafe 100644 (file)
--- a/rust/src/kerberos.rs
+++ b/rust/src/kerberos.rs
@@ -20,7 +20,7 @@ use kerberos_parser::krb5::{ApReq,Realm,PrincipalName};
 use nom;
 use nom::IResult;
 use nom::error::{ErrorKind, ParseError};
-use nom::number::complete::le_u16;
+use nom::number::streaming::le_u16;
 use der_parser;
 use der_parser::error::BerError;
 use der_parser::der::parse_der_oid;

diff --git a/rust/src/krb/krb5.rs b/rust/src/krb/krb5.rs
index 91f0aa57ec9058a36877f38ed5bbc6cc4218a568..259aa1de15936b8fcbbc11c16b309e405e0da31e 100644 (file)
--- a/rust/src/krb/krb5.rs
+++ b/rust/src/krb/krb5.rs
@@ -21,7 +21,7 @@ use std;
 use std::ffi::{CStr,CString};
 use nom;
 use nom::IResult;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 use der_parser::der::der_read_element_header;
 use kerberos_parser::krb5_parser;
 use kerberos_parser::krb5::{EncryptionType,ErrorCode,MessageType,PrincipalName,Realm};

diff --git a/rust/src/nfs/nfs2.rs b/rust/src/nfs/nfs2.rs
index c13155862fe5b1c599002e4686f4c8218b2f2bf6..7b25bb42398d9f73b62373d21f341dbb36f3983a 100644 (file)
--- a/rust/src/nfs/nfs2.rs
+++ b/rust/src/nfs/nfs2.rs
@@ -25,7 +25,7 @@ use crate::nfs::rpc_records::*;
 use crate::nfs::nfs2_records::*;
 
 use nom::IResult;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 
 impl NFSState {
     /// complete request record

diff --git a/rust/src/nfs/nfs2_records.rs b/rust/src/nfs/nfs2_records.rs
index 19f6a6c0b931a7db18093c7224e94c274ea14890..facaadda02f1682f803f8a255d4509f9bd7e46cc 100644 (file)
--- a/rust/src/nfs/nfs2_records.rs
+++ b/rust/src/nfs/nfs2_records.rs
@@ -17,7 +17,7 @@
 
 //! Nom parsers for NFSv2 records
 use nom::combinator::rest;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 use crate::nfs::nfs_records::*;
 
 #[derive(Debug,PartialEq)]

diff --git a/rust/src/nfs/nfs3.rs b/rust/src/nfs/nfs3.rs
index 3abb675715b03703eb99fd155a8bef308429fffa..0398e10cf6251ac4e6855db93cb605e15cbfc92d 100644 (file)
--- a/rust/src/nfs/nfs3.rs
+++ b/rust/src/nfs/nfs3.rs
@@ -26,7 +26,7 @@ use crate::nfs::rpc_records::*;
 use crate::nfs::nfs3_records::*;
 
 use nom::IResult;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 
 impl NFSState {
     /// complete NFS3 request record

diff --git a/rust/src/nfs/nfs3_records.rs b/rust/src/nfs/nfs3_records.rs
index 06ad38057ee87e225da0d2007a57758feef0d6d1..2130063ba1574e4a5405f5c058fd39850a484858 100644 (file)
--- a/rust/src/nfs/nfs3_records.rs
+++ b/rust/src/nfs/nfs3_records.rs
@@ -19,7 +19,7 @@
 
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::{be_u32, be_u64};
+use nom::number::streaming::{be_u32, be_u64};
 use crate::nfs::nfs_records::*;
 
 #[derive(Debug,PartialEq)]

diff --git a/rust/src/nfs/nfs4.rs b/rust/src/nfs/nfs4.rs
index cfc9b4697e6551ebbc30a02f30bf2a2fbc4f98bd..f1e527c078494a4467cb292b1abd8b0613c28cd6 100644 (file)
--- a/rust/src/nfs/nfs4.rs
+++ b/rust/src/nfs/nfs4.rs
@@ -18,7 +18,7 @@
 // written by Victor Julien
 
 use nom;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 
 use crate::core::*;
 use crate::log::*;

diff --git a/rust/src/nfs/nfs4_records.rs b/rust/src/nfs/nfs4_records.rs
index 9d08919a9547de5da5a98f3b11fd69bc7e57449b..e4f391f1e8eadea0361da96b861e1ac7d37efa44 100644 (file)
--- a/rust/src/nfs/nfs4_records.rs
+++ b/rust/src/nfs/nfs4_records.rs
@@ -16,7 +16,7 @@
  */
 
 //! Nom parsers for NFSv4 records
-use nom::number::complete::{be_u32, be_u64};
+use nom::number::streaming::{be_u32, be_u64};
 
 use crate::nfs::types::*;
 

diff --git a/rust/src/nfs/rpc_records.rs b/rust/src/nfs/rpc_records.rs
index d9c779adb824dc4885ebe07f971da069da72bc0e..a218eb717ce4e05f314895b8f999e465af449acf 100644 (file)
--- a/rust/src/nfs/rpc_records.rs
+++ b/rust/src/nfs/rpc_records.rs
@@ -19,7 +19,7 @@
 
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::be_u32;
+use nom::number::streaming::be_u32;
 
 #[derive(Debug,PartialEq)]
 pub enum RpcRequestCreds<'a> {

diff --git a/rust/src/rdp/parser.rs b/rust/src/rdp/parser.rs
index f38783b317302035dbaa65e77e0bcb1444feccc7..3b733818d600c9f468cf523883207b5f06cadc23 100644 (file)
--- a/rust/src/rdp/parser.rs
+++ b/rust/src/rdp/parser.rs
@@ -27,7 +27,7 @@
 //! * x.691-spec: <https://www.itu.int/rec/T-REC-X.691/en>
 
 use nom::IResult;
-use nom::bytes::complete::take;
+use nom::bytes::streaming::take;
 use nom::combinator::{opt, map_opt, map_res};
 use nom::number::streaming::{be_u16, be_u8, le_u16, le_u32, le_u8};
 use crate::rdp::error::RdpError;

diff --git a/rust/src/sip/parser.rs b/rust/src/sip/parser.rs
index 4edee68a8952110497fcd11bfc97dae9d5b23d64..be8e1cec85eb51fb5642bbefd50df70d521158d1 100644 (file)
--- a/rust/src/sip/parser.rs
+++ b/rust/src/sip/parser.rs
@@ -20,7 +20,7 @@
 use nom::*;
 use nom::IResult;
 use nom::character::{is_alphabetic, is_alphanumeric, is_space};
-use nom::character::complete::crlf;
+use nom::character::streaming::crlf;
 use std;
 use std::collections::HashMap;
 

diff --git a/rust/src/smb/dcerpc_records.rs b/rust/src/smb/dcerpc_records.rs
index 24992d635e52d361c90821e9fb89cec0c67176af..8d0b07faf98ba5acd1bf39b0dc3de582a04cad4e 100644 (file)
--- a/rust/src/smb/dcerpc_records.rs
+++ b/rust/src/smb/dcerpc_records.rs
@@ -20,7 +20,7 @@ use nom;
 use nom::IResult;
 use nom::combinator::rest;
 use nom::number::Endianness;
-use nom::number::complete::{be_u16, le_u8, le_u16, le_u32};
+use nom::number::streaming::{be_u16, le_u8, le_u16, le_u32};
 
 #[derive(Debug,PartialEq)]
 pub struct DceRpcResponseRecord<'a> {

diff --git a/rust/src/smb/ntlmssp_records.rs b/rust/src/smb/ntlmssp_records.rs
index 52ca9ee9cb3e6e4eb7186fdf4473847cff0e7a66..e0fca25c8ca7985c82f00dc092a3102c0084eeba 100644 (file)
--- a/rust/src/smb/ntlmssp_records.rs
+++ b/rust/src/smb/ntlmssp_records.rs
@@ -17,7 +17,7 @@
 
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::{le_u8, le_u16, le_u32};
+use nom::number::streaming::{le_u8, le_u16, le_u32};
 
 #[derive(Debug,PartialEq)]
 pub struct NTLMSSPVersion {

diff --git a/rust/src/smb/smb1_records.rs b/rust/src/smb/smb1_records.rs
index 148631fbf8fd84a6b1408c045e9a873bd1d28ca7..7a0cc1e22bf3f8bb3461d1716bdc089c4b2cc5ec 100644 (file)
--- a/rust/src/smb/smb1_records.rs
+++ b/rust/src/smb/smb1_records.rs
@@ -19,7 +19,7 @@ use crate::smb::error::SmbError;
 use crate::log::*;
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::{le_u8, le_u16, le_u32, le_u64};
+use nom::number::streaming::{le_u8, le_u16, le_u32, le_u64};
 use crate::smb::smb::*;
 use crate::smb::smb_records::*;
 

diff --git a/rust/src/smb/smb2_records.rs b/rust/src/smb/smb2_records.rs
index 69fede11bc68991d418c11ac54222778c8ea031f..fa6d62eb8975c5e47208fe6dc1e5daab23914501 100644 (file)
--- a/rust/src/smb/smb2_records.rs
+++ b/rust/src/smb/smb2_records.rs
@@ -18,7 +18,7 @@
 use nom;
 use nom::IResult;
 use nom::combinator::rest;
-use nom::number::complete::{le_u8, le_u16, le_u32, le_u64};
+use nom::number::streaming::{le_u8, le_u16, le_u32, le_u64};
 use crate::smb::smb::*;
 
 #[derive(Debug,PartialEq)]

diff --git a/rust/src/smb/smb3.rs b/rust/src/smb/smb3.rs
index 7043ef3ac2a18a8eb740478bc48b35e99cb63210..ffbaf49cc6568a6ba08a52360577a0990f5dd5dc 100644 (file)
--- a/rust/src/smb/smb3.rs
+++ b/rust/src/smb/smb3.rs
@@ -15,7 +15,7 @@
  * 02110-1301, USA.
  */
 
-use nom::number::complete::{le_u16, le_u32, le_u64};
+use nom::number::streaming::{le_u16, le_u32, le_u64};
 
 #[derive(Debug,PartialEq)]
 pub struct Smb3TransformRecord<'a> {