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

pull/4624/head
Pierre Chifflier 6 years ago committed by Victor Julien
parent df9a4fd635
commit 442500678b

@ -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,

@ -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;

@ -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::*;

@ -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;

@ -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};

@ -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

@ -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)]

@ -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

@ -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)]

@ -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::*;

@ -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::*;

@ -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> {

@ -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;

@ -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;

@ -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> {

@ -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 {

@ -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::*;

@ -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)]

@ -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> {

Loading…
Cancel
Save