New FilterSetParam function

phaag · Mar 17, 2024 · 9198d94 · 9198d94
1 parent d253340
commit 9198d94
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 12 deletions.
diff --git a/src/libnfdump/filter/filter.c b/src/libnfdump/filter/filter.c
@@ -89,8 +89,9 @@ typedef struct FilterEngine_s {
     uint32_t StartNode;
     uint16_t Extended;
     int hasGeoDB;
+    const char *ident;
     char *label;
-    int (*filterFunction)(const struct FilterEngine_s *, recordHandle_t *, const char *);
+    int (*filterFunction)(const struct FilterEngine_s *, recordHandle_t *);
 } FilterEngine_t;
 
 static filterElement_t *FilterTree = NULL;
@@ -587,13 +588,18 @@ static void InitFilter(void) {
     ClearFilter();
 }  // End of InitFilter
 
-int FilterRecord(void *engine, recordHandle_t *handle, const char *ident, const int hasGeoDB) {
+void FilterSetParam(void *engine, const char *ident, const int hasGeoDB) {
     FilterEngine_t *filterEngine = (FilterEngine_t *)engine;
     filterEngine->hasGeoDB = hasGeoDB;
-    return filterEngine->filterFunction(filterEngine, handle, ident);
+    filterEngine->ident = ident;
+}  // End of FilterSetParam
+
+int FilterRecord(const void *engine, recordHandle_t *handle) {
+    FilterEngine_t *filterEngine = (FilterEngine_t *)engine;
+    return filterEngine->filterFunction(filterEngine, handle);
 }  // End of FilterRecord
 
-static int RunFilterFast(const FilterEngine_t *engine, recordHandle_t *handle, const char *ident) {
+static int RunFilterFast(const FilterEngine_t *engine, recordHandle_t *handle) {
     uint32_t index = engine->StartNode;
     int invert = 0;
     int evaluate = 0;
@@ -639,7 +645,7 @@ static int RunFilterFast(const FilterEngine_t *engine, recordHandle_t *handle, c
 
 }  // End of RunFilter
 
-static int RunExtendedFilter(const FilterEngine_t *engine, recordHandle_t *handle, const char *ident) {
+static int RunExtendedFilter(const FilterEngine_t *engine, recordHandle_t *handle) {
     uint32_t index = engine->StartNode;
     int evaluate = 0;
     int invert = 0;
@@ -714,7 +720,7 @@ static int RunExtendedFilter(const FilterEngine_t *engine, recordHandle_t *handl
             } break;
             case CMP_IDENT: {
                 char *str = (char *)data.dataPtr;
-                evaluate = str != NULL && (strcmp(ident, str) == 0 ? 1 : 0);
+                evaluate = str != NULL && (strcmp(engine->ident, str) == 0 ? 1 : 0);
             } break;
             case CMP_STRING: {
                 char *str = (char *)data.dataPtr;

diff --git a/src/libnfdump/filter/filter.h b/src/libnfdump/filter/filter.h
@@ -156,7 +156,9 @@ void *CompileFilter(char *FilterSyntax);
 
 void DisposeFilter(void *engine);
 
-int FilterRecord(void *engine, recordHandle_t *handle, const char *ident, const int hasGeoDB);
+void FilterSetParam(void *engine, const char *ident, const int hasGeoDB);
+
+int FilterRecord(const void *engine, recordHandle_t *handle);
 
 void DumpEngine(void *arg);
 

diff --git a/src/nfdump/nfdump.c b/src/nfdump/nfdump.c
@@ -291,6 +291,7 @@ static stat_record_t process_data(void *engine, char *wfile, int element_stat, i
         }
         SetIdent(nffile_w, nffile_r->ident);
     }
+    FilterSetParam(engine, nffile_r->ident, outputParams->hasGeoDB);
 
     recordHandle_t *recordHandle = (recordHandle_t *)calloc(1, sizeof(recordHandle_t));
     if (!recordHandle) {
@@ -323,6 +324,7 @@ static stat_record_t process_data(void *engine, char *wfile, int element_stat, i
                     if (next->stat_record->lastseen > t_last_flow) t_last_flow = next->stat_record->lastseen;
                     // continue with next file
                 }
+                FilterSetParam(engine, nffile_r->ident, outputParams->hasGeoDB);
                 continue;
 
             } break;  // not really needed
@@ -379,7 +381,7 @@ static stat_record_t process_data(void *engine, char *wfile, int element_stat, i
 
                     if (match) {
                         // filter netflow record with user supplied filter
-                        match = FilterRecord(engine, recordHandle, nffile_r->ident, outputParams->hasGeoDB);
+                        match = FilterRecord(engine, recordHandle);
                     }
                     if (match == 0) {  // record failed to pass all filters
                         // go to next record

diff --git a/src/nfreplay/nfreplay.c b/src/nfreplay/nfreplay.c
@@ -227,6 +227,7 @@ static void send_data(void *engine, timeWindow_t *timeWindow, uint32_t limitReco
         LogError("Empty file list. No files to process\n");
         return;
     }
+    FilterSetParam(engine, nffile->ident, NOGEODB);
 
     peer.send_buffer = malloc(UDP_PACKET_SIZE);
     peer.flush = 0;
@@ -279,6 +280,7 @@ static void send_data(void *engine, timeWindow_t *timeWindow, uint32_t limitReco
                     done = 1;
                     LogError("Unexpected end of file list\n");
                 }
+                FilterSetParam(engine, nffile->ident, NOGEODB);
                 // else continue with next file
                 continue;
 
@@ -321,7 +323,7 @@ static void send_data(void *engine, timeWindow_t *timeWindow, uint32_t limitReco
 
                     // filter netflow record with user supplied filter
                     // XXX if (match) match = (*Engine->FilterEngine)(Engine);
-                    if (match) match = FilterRecord(engine, recordHandle, nffile->ident, 0);
+                    if (match) match = FilterRecord(engine, recordHandle);
 
                     if (match == 0) {  // record failed to pass all filters
                         // go to next record

diff --git a/src/nfsen/nfprofile.c b/src/nfsen/nfprofile.c
@@ -108,6 +108,11 @@ static void process_data(profile_channel_info_t *channels, unsigned int num_chan
         LogError("Empty file list. No files to process");
         return;
     }
+    for (int j = 0; j < num_channels; j++) {
+        // apply profile filter
+        void *engine = channels[j].engine;
+        FilterSetParam(engine, nffile->ident, NOGEODB);
+    }
 
     recordHandle_t *recordHandle = calloc(1, sizeof(recordHandle_t));
     if (!recordHandle) {
@@ -139,6 +144,11 @@ static void process_data(profile_channel_info_t *channels, unsigned int num_chan
                     continue;
                     LogError("Unexpected end of file list");
                 }
+                for (int j = 0; j < num_channels; j++) {
+                    // apply profile filter
+                    void *engine = channels[j].engine;
+                    FilterSetParam(engine, nffile->ident, NOGEODB);
+                }
 
                 continue;
 
@@ -169,7 +179,7 @@ static void process_data(profile_channel_info_t *channels, unsigned int num_chan
 
                         // apply profile filter
                         void *engine = channels[j].engine;
-                        match = FilterRecord(engine, recordHandle, FILE_IDENT(nffile), NOGEODB);
+                        match = FilterRecord(engine, recordHandle);
 
                         // if profile filter failed -> next profile
                         if (!match) continue;

diff --git a/src/nfsen/nftrack.c b/src/nfsen/nftrack.c
@@ -159,6 +159,7 @@ static data_row *process(void *engine) {
         LogError("Empty file list. No files to process\n");
         return NULL;
     }
+    FilterSetParam(engine, nffile->ident, NOGEODB);
 
     port_table = (data_row *)calloc(65536, sizeof(data_row));
     if (!port_table) {
@@ -195,6 +196,7 @@ static data_row *process(void *engine) {
                     done = 1;
                     LogError("Unexpected end of file list\n");
                 }
+                FilterSetParam(engine, nffile->ident, NOGEODB);
                 // else continue with next file
                 continue;
 
@@ -219,7 +221,7 @@ static data_row *process(void *engine) {
                 case V3Record: {
                     processed++;
                     MapRecordHandle(recordHandle, (recordHeaderV3_t *)record_ptr, processed);
-                    int ret = FilterRecord(engine, recordHandle, nffile->ident, NOGEODB);
+                    int ret = FilterRecord(engine, recordHandle);
 
                     if (ret == 0) {  // record failed to pass the filter
                         // increment pointer by number of bytes for netflow record

diff --git a/src/test/nftest.c b/src/test/nftest.c
@@ -111,7 +111,8 @@ static void CheckFilter(char *filter, recordHandle_t *recordHandle, int expect)
     } else {
         printf("Compiled ok: %s\n", filter);
     }
-    int ret = FilterRecord(engine, recordHandle, NULL, NOGEODB);
+    FilterSetParam(engine, NULL, NOGEODB);
+    int ret = FilterRecord(engine, recordHandle);
     if (ret != expect) {
         printf("*** Filter failed for %s\n", filter);
         printf("*** Expected %d, result: %d\n", expect, ret);