fix: more ipfix cleanup

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "netflow_parser"
 description = "Parser for Netflow Cisco V5, V7, V9, IPFIX"
-version = "0.5.4"
+version = "0.5.5"
 edition = "2024"
 authors = ["michael.mileusnich@gmail.com"]
 license = "MIT OR Apache-2.0"

README.md

@@ -48,7 +48,7 @@ let parsed = NetflowParser::default().parse_bytes(&v5_packet);
 let v5_parsed: Vec<NetflowPacket> = parsed.into_iter().filter(|p| p.is_v5()).collect();
 ```
 
-## Parsing out uneeded versions
+## Parsing out unneeded versions
 If you only care about a specific version or versions you can specfic `allowed_version`:
 ```rust
 use netflow_parser::{NetflowParser, NetflowPacket};

RELEASES.md

@@ -1,3 +1,6 @@
+# 0.5.5
+* More IPFIx/V9 Cleanup.
+
 # 0.5.4
 * Reworked how padding is calculated for IPFIx.
 * Fixed Vecs not being exported for DataNumber.

src/lib.rs

@@ -48,7 +48,7 @@
 //! let v5_parsed: Vec<NetflowPacket> = parsed.into_iter().filter(|p| p.is_v5()).collect();
 //! ```
 //!
-//! ## Parsing out uneeded versions
+//! ## Parsing out unneeded versions
 //! If you only care about a specific version or versions you can specfic `allowed_version`:
 //! ```rust
 //! use netflow_parser::{NetflowParser, NetflowPacket};
@@ -202,8 +202,6 @@ use variable_versions::v9::{V9, V9Parser};
 
 use crate::static_versions::v5;
 use crate::static_versions::v7;
-use crate::variable_versions::ipfix;
-use crate::variable_versions::v9;
 
 use nom_derive::{Nom, Parse};
 use serde::Serialize;
@@ -260,7 +258,7 @@ pub struct NetflowParser {
 }
 
 #[derive(Debug, Clone)]
-pub(crate) struct ParsedNetflow {
+pub struct ParsedNetflow {
     pub(crate) remaining: Vec<u8>,
     /// Parsed Netflow Packet
     pub(crate) result: NetflowPacket,
@@ -397,8 +395,8 @@ impl NetflowParser {
         match version {
             5 => v5::parse_netflow_v5(packet),
             7 => v7::parse_netflow_v7(packet),
-            9 => v9::parse_netflow_v9(packet, &mut self.v9_parser),
-            10 => ipfix::parse_netflow_ipfix(packet, &mut self.ipfix_parser),
+            9 => self.v9_parser.parse(packet),
+            10 => self.ipfix_parser.parse(packet),
             _ => Err(NetflowParseError::UnknownVersion(packet.to_vec())),
         }
     }

src/netflow_common.rs

@@ -238,14 +238,14 @@ mod common_tests {
     use std::collections::BTreeMap;
     use std::net::{IpAddr, Ipv4Addr};
 
-    use crate::ipfix::{
-        Data as IPFixData, FlowSet as IPFixFlowSet, FlowSetBody as IPFixFlowSetBody,
-        FlowSetHeader as IPFixFlowSetHeader, Header as IPFixHeader, IPFix,
-    };
     use crate::netflow_common::NetflowCommon;
     use crate::static_versions::v5::{FlowSet as V5FlowSet, Header as V5Header, V5};
     use crate::static_versions::v7::{FlowSet as V7FlowSet, Header as V7Header, V7};
     use crate::variable_versions::data_number::{DataNumber, FieldValue};
+    use crate::variable_versions::ipfix::{
+        Data as IPFixData, FlowSet as IPFixFlowSet, FlowSetBody as IPFixFlowSetBody,
+        FlowSetHeader as IPFixFlowSetHeader, Header as IPFixHeader, IPFix,
+    };
     use crate::variable_versions::ipfix_lookup::IPFixField;
     use crate::variable_versions::v9::{
         Data as V9Data, FlowSet as V9FlowSet, FlowSetBody as V9FlowSetBody,

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_with_no_template_fields.snap

@@ -0,0 +1,12 @@
+---
+source: src/tests.rs
+expression: parser.parse_bytes(&packet)
+---
+- IPFix:
+    header:
+      version: 10
+      length: 26
+      export_time: 1
+      sequence_number: 1
+      observation_domain_id: 0
+    flowsets: []

src/tests.rs

@@ -358,7 +358,7 @@ mod base_tests {
     }
 
     #[test]
-    fn it_parses_ipfix_with_no_template_fields_raises_error() {
+    fn it_parses_ipfix_with_no_template_fields() {
         let packet = [
             0, 10, 0, 26, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 2, 0, 10, 0, 8, 0, 0, 1, 1,
         ];