Fix #554 - code dump in new processing pipeline.

phaag · Aug 9, 2024 · 10d4666 · 10d4666
1 parent 493c542
commit 10d4666
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/libnfdump/filter/filter.c b/src/libnfdump/filter/filter.c
@@ -612,7 +612,7 @@ static void InitFilter(void) {
 void FilterSetParam(void *engine, const char *ident, const int hasGeoDB) {
     FilterEngine_t *filterEngine = (FilterEngine_t *)engine;
     filterEngine->hasGeoDB = hasGeoDB;
-    filterEngine->ident = ident;
+    filterEngine->ident = ident ? ident : "none";
 }  // End of FilterSetParam
 
 void *FilterCloneEngine(void *engine) {

diff --git a/src/nfdump/nfdump.c b/src/nfdump/nfdump.c
@@ -289,7 +289,10 @@ __attribute__((noreturn)) static void *prepareThread(void *arg) {
 
     int done = nffile == NULL;
     while (!done) {
-        if (dataHandle == NULL) dataHandle = calloc(1, sizeof(dataHandle_t));
+        if (dataHandle == NULL) {
+            dataHandle = calloc(1, sizeof(dataHandle_t));
+            dataHandle->ident = nffile->ident;
+        }
         dataHandle->dataBlock = ReadBlock(nffile, NULL);
 
         // get next data block from file
@@ -300,7 +303,6 @@ __attribute__((noreturn)) static void *prepareThread(void *arg) {
             } else {
                 if (nffile->stat_record->firstseen < t_first_flow) t_first_flow = nffile->stat_record->firstseen;
                 if (nffile->stat_record->lastseen > t_last_flow) t_last_flow = nffile->stat_record->lastseen;
-                dataHandle->ident = nffile->ident;
             }
             continue;
         }