Skip to content

in parse_pcap, handle big endian and modified pcap headers #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iczero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

in parse_pcap, handle big endian and modified pcap headers #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/pcap/capture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::capture::Capture;
use crate::error::PcapError;
use crate::linktype::Linktype;
use crate::pcap::{parse_pcap_frame, parse_pcap_header, LegacyPcapBlock, PcapHeader};
use crate::{parse_pcap_frame_be, parse_pcap_frame_modified};
use nom::combinator::complete;
use nom::multi::many0;
use nom::{IResult, Needed, Parser as _};
Expand Down Expand Up @@ -121,6 +122,15 @@ impl Capture for PcapCapture<'_> {
/// Note: this requires the file to be fully loaded to memory.
pub fn parse_pcap(i: &[u8]) -> IResult<&[u8], PcapCapture<'_>, PcapError<&[u8]>> {
let (i, header) = parse_pcap_header(i)?;
let (i, blocks) = many0(complete(parse_pcap_frame)).parse(i)?;
let parse = if !header.is_modified_format() {
if header.is_bigendian() {
parse_pcap_frame_be
} else {
parse_pcap_frame
}
} else {
parse_pcap_frame_modified
};
let (i, blocks) = many0(complete(parse)).parse(i)?;
Ok((i, PcapCapture { header, blocks }))
}
Loading