fix: Supports V9 Data & Templates for IPFix

Author: Michael Mileusnich

RELEASES.md

@@ -1,6 +1,7 @@
 # 0.5.6
 * Simplify V9/IPFix Parse function.
 * Added more cases for DataNumber Parsing.
+* IPFix now supports V9 Templates/Options Templates.
 
 # 0.5.5
 * More IPFIx/V9 Cleanup.

src/netflow_common.rs

@@ -122,7 +122,7 @@ impl From<&V9> for NetflowCommon {
         let mut flowsets = vec![];
 
         for flowset in &value.flowsets {
-            if let V9FlowSetBody::Data(data) = &flowset.body {
+            if let V9FlowSetBody::V9Data(data) = &flowset.body {
                 for data_field in &data.fields {
                     let value_map: BTreeMap<V9Field, FieldValue> =
                         data_field.values().cloned().collect();
@@ -181,7 +181,7 @@ impl From<&IPFix> for NetflowCommon {
         let mut flowsets = vec![];
 
         for flowset in &value.flowsets {
-            if let IPFixFlowSetBody::Data(data) = &flowset.body {
+            if let IPFixFlowSetBody::IPFixData(data) = &flowset.body {
                 for data_field in &data.fields {
                     let value_map: BTreeMap<IPFixField, FieldValue> =
                         data_field.values().cloned().collect();
@@ -246,13 +246,13 @@ mod common_tests {
     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,
+        FlowSet as IPFixFlowSet, FlowSetBody as IPFixFlowSetBody,
+        FlowSetHeader as IPFixFlowSetHeader, Header as IPFixHeader, IPFix, IPFixData,
     };
     use crate::variable_versions::ipfix_lookup::IPFixField;
     use crate::variable_versions::v9::{
-        Data as V9Data, FlowSet as V9FlowSet, FlowSetBody as V9FlowSetBody,
-        FlowSetHeader as V9FlowSetHeader, Header as V9Header, V9,
+        FlowSet as V9FlowSet, FlowSetBody as V9FlowSetBody, FlowSetHeader as V9FlowSetHeader,
+        Header as V9Header, V9, V9Data,
     };
     use crate::variable_versions::v9_lookup::V9Field;
 
@@ -400,7 +400,7 @@ mod common_tests {
                     flowset_id: 0,
                     length: 0,
                 },
-                body: V9FlowSetBody::Data(V9Data {
+                body: V9FlowSetBody::V9Data(V9Data {
                     padding: vec![],
                     fields: vec![BTreeMap::from([
                         (
@@ -510,7 +510,7 @@ mod common_tests {
                     header_id: 0,
                     length: 0,
                 },
-                body: IPFixFlowSetBody::Data(IPFixData {
+                body: IPFixFlowSetBody::IPFixData(IPFixData {
                     padding: vec![],
                     fields: vec![BTreeMap::from([
                         (

src/snapshots/netflow_parser__tests__base_tests__it_parses_0_length_fields_ipfix.snap

@@ -14,7 +14,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 2
           length: 20
         body:
-          Template:
+          IPFixTemplate:
             template_id: 256
             field_count: 3
             fields:
@@ -31,7 +31,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 256
           length: 12
         body:
-          Data:
+          IPFixData:
             fields:
               - 0:
                   - SourceIpv4address

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix.snap

@@ -14,7 +14,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 2
           length: 20
         body:
-          Template:
+          IPFixTemplate:
             template_id: 256
             field_count: 3
             fields:
@@ -31,7 +31,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 256
           length: 28
         body:
-          Data:
+          IPFixData:
             fields:
               - 0:
                   - SourceIpv4address

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_data_cached_template.snap

@@ -14,7 +14,7 @@ expression: parser.parse_bytes(&packet)
           header_id: 258
           length: 10
         body:
-          Data:
+          IPFixData:
             fields:
               - 0:
                   - PacketDeltaCount

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_enterprise_bit_in_non_options_template.snap

@@ -14,7 +14,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 2
           length: 26
         body:
-          Template:
+          IPFixTemplate:
             template_id: 260
             field_count: 2
             fields:

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_enterprise_bit_template_and_data.snap

@@ -14,7 +14,7 @@ expression: result
           header_id: 2
           length: 228
         body:
-          Template:
+          IPFixTemplate:
             template_id: 268
             field_count: 34
             fields:
@@ -153,7 +153,7 @@ expression: result
           header_id: 268
           length: 172
         body:
-          Data:
+          IPFixData:
             fields:
               - 0:
                   - Enterprise

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_options_template.snap

@@ -14,7 +14,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 3
           length: 28
         body:
-          OptionsTemplate:
+          IPFixOptionsTemplate:
             template_id: 260
             field_count: 3
             scope_field_count: 1

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_options_template_with_data.snap

@@ -14,7 +14,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 3
           length: 28
         body:
-          OptionsTemplate:
+          IPFixOptionsTemplate:
             template_id: 260
             field_count: 3
             scope_field_count: 1
@@ -33,7 +33,7 @@ expression: "NetflowParser::default().parse_bytes(&packet)"
           header_id: 260
           length: 20
         body:
-          OptionsData:
+          IPFixOptionsData:
             fields:
               - 0:
                   - Enterprise

src/snapshots/netflow_parser__tests__base_tests__it_parses_ipfix_scappy_example.snap

@@ -14,7 +14,7 @@ expression: result
           header_id: 2
           length: 100
         body:
-          Template:
+          IPFixTemplate:
             template_id: 307
             field_count: 23
             fields:
@@ -99,7 +99,7 @@ expression: result
           header_id: 307
           length: 80
         body:
-          Data:
+          IPFixData:
             fields:
               - 0:
                   - SourceIpv4address