v9 fixes

Author: Michael Mileusnich

src/variable_versions/ipfix.rs

@@ -122,7 +122,7 @@ pub struct OptionsTemplate {
     #[nom(
         PreExec = "let combined_count = scope_field_count as usize + 
                        field_count.checked_sub(scope_field_count).unwrap_or(field_count) as usize;",
-        Parse = "count(|i| TemplateField::parse(i, true), combined_count as usize)"
+        Parse = "count(|i| TemplateField::parse(i, true), combined_count)"
     )]
     pub fields: Vec<TemplateField>,
     #[nom(Cond = "!i.is_empty()")]

src/variable_versions/v9.rs

@@ -224,7 +224,7 @@ pub struct OptionsData {
     pub length: u16,
     // Scope Data
     #[nom(
-        Parse = "{ |i| parse_scope_data_fields(i, flow_set_id, parser.options_templates.clone()) }"
+        Parse = "{ |i| parse_scope_data_fields(i, flow_set_id, &parser.options_templates) }"
     )]
     pub scope_fields: Vec<ScopeDataField>,
     // Options Data Fields
@@ -464,11 +464,11 @@ fn parse_options_data_fields(
     Ok((remaining, fields))
 }
 
-fn parse_scope_data_fields(
-    i: &[u8],
+fn parse_scope_data_fields<'a>(
+    i: &'a [u8],
     flow_set_id: u16,
-    templates: HashMap<u16, OptionsTemplate>,
-) -> IResult<&[u8], Vec<ScopeDataField>> {
+    templates: &HashMap<u16, OptionsTemplate>,
+) -> IResult<&'a [u8], Vec<ScopeDataField>> {
     let template = templates.get(&flow_set_id).ok_or_else(|| {
         // dbg!("Could not fetch any v9 options templates!");
         NomErr::Error(NomError::new(i, ErrorKind::Fail))