Add dot1q in ipfix. Fix for #515

phaag · Mar 29, 2024 · 1b6139e · 1b6139e
1 parent c4a2575
commit 1b6139e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/netflow/ipfix.c b/src/netflow/ipfix.c
@@ -173,6 +173,8 @@ static const struct ipfixTranslationMap_s {
     {IPFIX_postDestinationMacAddress, SIZEoutDstMac, NumberCopy, EXmacAddrID, OFFoutDstMac, STACK_NONE, "out dst MAC addr"},
     {IPFIX_vlanId, SIZEsrcVlan, NumberCopy, EXvLanID, OFFsrcVlan, STACK_NONE, "src VLAN ID"},
     {IPFIX_postVlanId, SIZEdstVlan, NumberCopy, EXvLanID, OFFdstVlan, STACK_NONE, "dst VLAN ID"},
+    {IPFIX_dot1qVlanId, SIZEsrcVlan, NumberCopy, EXvLanID, OFFsrcVlan, STACK_NONE, "src VLAN ID"},
+    {IPFIX_postDot1qVlanId, SIZEdstVlan, NumberCopy, EXvLanID, OFFdstVlan, STACK_NONE, "dst VLAN ID"},
     {IPFIX_flowDirection, SIZEdir, NumberCopy, EXflowMiscID, OFFdir, STACK_NONE, "flow direction"},
     {IPFIX_biflowDirection, SIZEbiFlowDir, NumberCopy, EXflowMiscID, OFFbiFlowDir, STACK_NONE, "biFlow direction"},
     {IPFIX_flowEndReason, SIZEflowEndReason, NumberCopy, EXflowMiscID, OFFflowEndReason, STACK_NONE, "Flow end reason"},

diff --git a/src/netflow/ipfix.h b/src/netflow/ipfix.h
@@ -306,6 +306,9 @@ typedef struct ipfix_template_elements_e_s {
 
 #define IPFIX_biflowDirection 239
 
+#define IPFIX_dot1qVlanId 243
+#define IPFIX_postDot1qVlanId 254
+
 // sub template IDs
 #define IPFIX_newconnections 278
 #define IPFIX_subTemplateList 292