Merge pull request #69 from CESNET/ipfix_elements_fix

ipfix-elements: fixed comments and WireGuard ids

Author: cejkato2

include/ipfixprobe/ipfix-elements.hpp

@@ -193,9 +193,9 @@ namespace ipxp {
 #define ARP_DST_PA(F)                 F(8057,    37,   -1,   nullptr)
 
 #define TLS_SNI(F)                    F(8057,   808,   -1,   nullptr)
-#define TLS_ALPN(F)                   F(8057,   809,   -1,   nullptr)
-#define TLS_VERSION(F)                F(8057,   810,    2,   nullptr)
-#define TLS_JA3(F)                    F(8057,   830,   -1,   nullptr)
+#define TLS_VERSION(F)                F(39499,  333,    2,   nullptr)
+#define TLS_ALPN(F)                   F(39499,  337,   -1,   nullptr)
+#define TLS_JA3(F)                    F(39499,  357,   -1,   nullptr)
 
 #define SMTP_COMMANDS(F)              F(8057,    810,   4,   nullptr)
 #define SMTP_MAIL_COUNT(F)            F(8057,    811,   4,   nullptr)
@@ -241,14 +241,10 @@ namespace ipxp {
 #define DBI_BRST_TIME_START(F)        F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1056 (time*)
 #define DBI_BRST_TIME_STOP(F)         F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1057 (time*)
 
-#define D_PHISTS_IPT(F)               F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1063 (uint16*)
-#define D_PHISTS_SIZES(F)             F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1062 (uint16*)
-#define S_PHISTS_SIZES(F)             F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1060 (uint16*)
-#define S_PHISTS_IPT(F)               F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1061 (uint16*)
-
-#define WG_CONF_LEVEL(F)              F(8057,    861,   1,   nullptr)
-#define WG_SRC_PEER(F)                F(8057,    862,   4,   nullptr)
-#define WG_DST_PEER(F)                F(8057,    863,   4,   nullptr)
+#define D_PHISTS_IPT(F)               F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1063 (uint32*)
+#define D_PHISTS_SIZES(F)             F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1062 (uint32*)
+#define S_PHISTS_SIZES(F)             F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1060 (uint32*)
+#define S_PHISTS_IPT(F)               F(0,       291,  -1,   nullptr) // BASIC LIST -- FIELD IS e8057id1061 (uint32*)
 
 #define QUIC_SNI(F)                   F(8057,    890,   -1,  nullptr)
 
@@ -269,6 +265,10 @@ namespace ipxp {
 #define FX_TCP_TRACKING(F)            F(5715,   1020,   1,   nullptr)
 #endif
 
+#define WG_CONF_LEVEL(F)              F(8057,    1100,   1,   nullptr)
+#define WG_SRC_PEER(F)                F(8057,    1101,   4,   nullptr)
+#define WG_DST_PEER(F)                F(8057,    1102,   4,   nullptr)
+
 /**
  * IPFIX Templates - list of elements
  *