NetFlow converter: now ignores unknown FlowSets, added more unit tests

Author: Lukas955

src/core/netflow2ipfix/netflow9.c

@@ -1042,7 +1042,7 @@ conv_process_dset(ipx_nf9_conv_t *conv, const struct ipx_nf9_set_hdr *flowset_hd
     size_t hdr_offset = conv_mem_pos_get(conv);
     conv_mem_commit(conv, FDS_IPFIX_SET_HDR_LEN);
 
-    // Convert all records in the Template Set
+    // Convert all records in the Data Set
     uint16_t rec_processed = 0;
     struct ipx_nf9_dset_iter it;
     ipx_nf9_dset_iter_init(&it, flowset_hdr, tmplt->nf9_drec_len);
@@ -1132,8 +1132,8 @@ conv_process_msg(ipx_nf9_conv_t *conv, const struct ipx_nf9_msg_hdr *nf9_msg, ui
             rc_conv = conv_process_tset(conv, it.set);
         } else {
             // Unknown FlowSet ID // TODO: skip unknown
-            CONV_ERROR(conv, "Unknown FlowSet ID %" PRIu16, flowset_id);
-            rc_conv = IPX_ERR_FORMAT;
+            CONV_INFO(conv, "Ignoring FlowSet with unsupported ID %" PRIu16, flowset_id);
+            rc_conv = IPX_OK;
         }
     }
 

src/core/netflow2ipfix/netflow9_parsers.c

@@ -43,7 +43,8 @@ static const char *err_msg[] = {
     [ERR_SETS_LONG]   = "Total length of the FlowSet is longer than its enclosing NetFlow v9 "
         "Message.",
     // Data FlowSet iterator
-    [ERR_DSET_EMPTY]  = "A DataFlow Set must not be empty. At least one record must be present.",
+    [ERR_DSET_EMPTY]  = "A DataFlow Set is empty or contains a malformed record (shorted that "
+        "described in its particular template). At least one valid record must be present.",
     // (Options) Template FlowSet iterator
     [ERR_TSET_EMPTY]  = "An (Options) Template FlowSet must not be empty. At least one record must "
         "be present.",
@@ -137,7 +138,7 @@ ipx_nf9_dset_iter_init(struct ipx_nf9_dset_iter *it, const struct ipx_nf9_set_hd
     it->_private.err_msg = err_msg[ERR_OK];
 
     if (it->_private.rec_next + rec_size > it->_private.set_end) {
-        // Empty set is not valid (see RFC 3954, Section 2, FlowSet)
+        // Empty set is not valid (see RFC 3954, Section 2, Data FlowSet)
         it->_private.flags |= IPX_NF9_DSET_ITER_FAILED;
         it->_private.err_msg = err_msg[ERR_DSET_EMPTY];
     }