Fix flow counter in sort list. #575

phaag · Nov 10, 2024 · ad15f25 · ad15f25
1 parent c1db0ce
commit ad15f25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/nfdump/nflowcache.c b/src/nfdump/nflowcache.c
@@ -1610,9 +1610,15 @@ static inline void PrintSortList(SortElement_t *SortList, uint64_t maxindex, out
         genericFlow->tcpFlags = flowRecord->inFlags;
 
         EXcntFlow_t tmpCntFlow = {0};
-        if (cntFlow == NULL && (flowRecord->flows > 1 || flowRecord->outPackets)) {
-            recordHandle.extensionList[EXcntFlowID] = &tmpCntFlow;
-            cntFlow = &tmpCntFlow;
+        if (cntFlow == NULL) {
+            if (flowRecord->flows > 1 || flowRecord->outPackets) {
+                recordHandle.extensionList[EXcntFlowID] = &tmpCntFlow;
+                cntFlow = &tmpCntFlow;
+                cntFlow->outPackets = flowRecord->outPackets;
+                cntFlow->outBytes = flowRecord->outBytes;
+                cntFlow->flows = flowRecord->flows;
+            }
+        } else {
             cntFlow->outPackets = flowRecord->outPackets;
             cntFlow->outBytes = flowRecord->outBytes;
             cntFlow->flows = flowRecord->flows;

diff --git a/src/nfpcapd/nfpcapd.c b/src/nfpcapd/nfpcapd.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <libgen.h>
 
 #include "config.h"