Merge pull request #76 from CESNET/quic_new

FEATURE: Export of new information elements in QUIC plugin

Author: SiskaPavel

include/ipfixprobe/ipfix-elements.hpp

@@ -246,7 +246,9 @@ namespace ipxp {
 #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)
+#define QUIC_SNI(F)                   F(8057,    890,  -1,   nullptr)
+#define QUIC_USER_AGENT(F)            F(8057,    891,  -1,   nullptr)
+#define QUIC_VERSION(F)               F(8057,    892,   4,   nullptr)
 
 #define OSQUERY_PROGRAM_NAME(F)       F(8057,    852,  -1,   nullptr)
 #define OSQUERY_USERNAME(F)           F(8057,    853,  -1,   nullptr)
@@ -478,7 +480,9 @@ namespace ipxp {
   F(WG_DST_PEER)
 
 #define IPFIX_QUIC_TEMPLATE(F) \
-  F(QUIC_SNI)
+  F(QUIC_SNI) \
+  F(QUIC_USER_AGENT) \
+  F(QUIC_VERSION)
 
 #define IPFIX_OSQUERY_TEMPLATE(F) \
    F(OSQUERY_PROGRAM_NAME) \

pcaps/more_initial_samples.pcapng

@@ -137,37 +137,37 @@ struct RecordExtHTTP : public RecordExt {
       uint32_t total_length = 0;
 
       length = strlen(user_agent);
-      if (uint32_t (length + 1) > (uint32_t) size) {
+      if ((uint32_t) (length + 3) > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) user_agent, length);
 
       length = strlen(method);
-      if (total_length + length + 3 > (uint32_t)size) {
+      if (total_length + length + 3 > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) method, length);
 
       length = strlen(host);
-      if (total_length + length + 3 > (uint32_t)size) {
+      if (total_length + length + 3 > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) host, length);
 
       length = strlen(referer);
-      if (total_length + length + 3 > (uint32_t)size) {
+      if (total_length + length + 3 > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) referer, length);
 
       length = strlen(uri);
-      if (total_length + length + 4 > (uint32_t)size) {
+      if (total_length + length + 3 > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) uri, length);
 
       length = strlen(content_type);
-      if (total_length + length + 3 > (uint32_t)size) {
+      if (total_length + length + 3 > (uint32_t) size) {
          return -1;
       }
       total_length += variable2ipfix_buffer(buffer + total_length, (uint8_t*) content_type, length);