Fix v9 mac address parsing (#47)

Author: maksimtor

Cargo.toml

@@ -12,6 +12,7 @@ repository = "https://github.com/mikemiles-dev/netflow_parser/"
 [dependencies]
 nom = "7.1.3"
 nom-derive = "0.10.1"
+mac_address = "1.1.5"
 serde = { version = "1.0.166", features = ["derive"] }
 
 [features]

src/variable_versions/common.rs

@@ -70,6 +70,15 @@ impl DataNumber {
                 let ip_addr = Ipv6Addr::from(taken);
                 (i, FieldValue::Ip6Addr(ip_addr))
             }
+            FieldDataType::MacAddr => {
+                let (i, taken) = take(6 as usize)(remaining)?;
+                let taken: &[u8; 6] = taken
+                    .try_into()
+                    .map_err(|_| NomErr::Error(NomError::new(remaining, ErrorKind::Fail)))?;
+
+                let mac_addr = mac_address::MacAddress::from(*taken).to_string();
+                (i, FieldValue::MacAddr(mac_addr))
+            }
             FieldDataType::DurationSeconds => {
                 let (i, data_number) = DataNumber::parse(remaining, field_length, false)?;
                 (
@@ -149,6 +158,7 @@ pub enum FieldValue {
     Duration(Duration),
     Ip4Addr(Ipv4Addr),
     Ip6Addr(Ipv6Addr),
+    MacAddr(String),
     Vec(Vec<u8>),
     ProtocolType(ProtocolTypes),
     Unknown,
@@ -167,6 +177,7 @@ pub enum FieldDataType {
     DurationNanos,
     Ip4Addr,
     Ip6Addr,
+    MacAddr,
     Vec,
     ProtocolType,
     Unknown,

src/variable_versions/v9_lookup.rs

@@ -185,8 +185,8 @@ impl From<V9Field> for FieldDataType {
             53 => FieldDataType::UnsignedDataNumber,
             54 => FieldDataType::UnsignedDataNumber,
             55 => FieldDataType::UnsignedDataNumber,
-            56 => FieldDataType::UnsignedDataNumber,
-            57 => FieldDataType::UnsignedDataNumber,
+            56 => FieldDataType::MacAddr,
+            57 => FieldDataType::MacAddr,
             58 => FieldDataType::UnsignedDataNumber,
             60 => FieldDataType::UnsignedDataNumber,
             61 => FieldDataType::UnsignedDataNumber,
@@ -203,8 +203,8 @@ impl From<V9Field> for FieldDataType {
             77 => FieldDataType::UnsignedDataNumber,
             78 => FieldDataType::UnsignedDataNumber,
             79 => FieldDataType::UnsignedDataNumber,
-            80 => FieldDataType::UnsignedDataNumber,
-            81 => FieldDataType::UnsignedDataNumber,
+            80 => FieldDataType::MacAddr,
+            81 => FieldDataType::MacAddr,
             82 => FieldDataType::UnsignedDataNumber,
             83 => FieldDataType::UnsignedDataNumber,
             84 => FieldDataType::UnsignedDataNumber,