pcapng: add helpers for SHB options

Author: chifflier

examples/pcap-info.rs

@@ -34,11 +34,15 @@ fn print_pcap_info(arg: &str) -> Result<(), Box<dyn Error>> {
  // first block should be a SectionHeader
  if let Block::SectionHeader(sh) = block {
  println!("\t\tVersion: {}.{}", sh.major_version, sh.minor_version);
- let shb_hardware = sh.shb_hardware();
- println!(
- "\t\tshb_hardware: {}",
- shb_hardware.transpose()?.unwrap_or("<invalid>")
- );
+ if let Some(option) = sh.shb_hardware() {
+ println!("\t\tshb_hardware: {}", option.unwrap_or("<none>"));
+ }
+ if let Some(option) = sh.shb_os() {
+ println!("\t\tshb_os: {}", option.unwrap_or("<none>"));
+ }
+ if let Some(option) = sh.shb_userappl() {
+ println!("\t\tshb_userappl: {}", option.unwrap_or("<none>"));
+ }
  } else {
  return Err("pcapng: block is not a section header".into());
  }

src/pcapng/section_header.rs

@@ -34,7 +34,7 @@ impl<'a> SectionHeaderBlock<'a> {
 
  /// Return the `shb_hardware` option value, if present
  ///
- /// Attempt to retrieve the `shb_hardware` value
+ /// If the option is present multiple times, the first value is returned.
  ///
  /// Returns `None` if option is not present, `Some(Ok(value))` if the value is present and valid,
  /// or `Some(Err(_))` if value is present but invalid
@@ -47,6 +47,38 @@ impl<'a> SectionHeaderBlock<'a> {
  }
  })
  }
+
+ /// Return the `shb_os` option value, if present
+ ///
+ /// If the option is present multiple times, the first value is returned.
+ ///
+ /// Returns `None` if option is not present, `Some(Ok(value))` if the value is present and valid,
+ /// or `Some(Err(_))` if value is present but invalid
+ pub fn shb_os(&self) -> Option<Result<&str, PcapNGOptionError>> {
+ self.options.iter().find_map(|opt| {
+ if opt.code == OptionCode::ShbOs {
+ Some(opt.as_str())
+ } else {
+ None
+ }
+ })
+ }
+
+ /// Return the `shb_userappl` option value, if present
+ ///
+ /// If the option is present multiple times, the first value is returned.
+ ///
+ /// Returns `None` if option is not present, `Some(Ok(value))` if the value is present and valid,
+ /// or `Some(Err(_))` if value is present but invalid
+ pub fn shb_userappl(&self) -> Option<Result<&str, PcapNGOptionError>> {
+ self.options.iter().find_map(|opt| {
+ if opt.code == OptionCode::ShbUserAppl {
+ Some(opt.as_str())
+ } else {
+ None
+ }
+ })
+ }
 }
 
 impl<'a> PcapNGBlockParser<'a, PcapBE, SectionHeaderBlock<'a>> for SectionHeaderBlock<'a> {