Fix proper EXnull handling

phaag · phaag · commit 1b73c9273431 · 2026-03-04T15:19:45.000+01:00
diff --git a/src/inline/nffile_inline.c b/src/inline/nffile_inline.c
@@ -85,7 +85,6 @@ static inline void ResolveMultipleIPrecords(recordHandle_t *handle, recordHeader
         elementHeader_t *elementHeader = (elementHeader_t *)(skipElement - sizeof(elementHeader_t));
         elementHeader->type = EXnull;
         handle->extensionList[skipID] = NULL;
-        recordHeaderV3->numElements--;
     }
 
 #ifdef DEVEL
@@ -117,6 +116,7 @@ static inline int MapRecordHandle(recordHandle_t *handle, recordHeaderV3_t *reco
         if (elementHeader->type == 0) {
             // Skip this record - advance to next record
             elementHeader = (elementHeader_t *)((void *)elementHeader + elementHeader->length);
+            num++;
             continue;
         }
         if (elementHeader->type < MAXEXTENSIONS) {
diff --git a/src/test/nftest.1.out b/src/test/nftest.1.out
@@ -1207,7 +1207,7 @@ Flow Record:
   RecordCount  =                 35
   Ident        =          TestFlows
   Flags        =               0x00 NETFLOW v10, Unsampled
-  Elements     =                 18: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
+  Elements     =                 19: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
   size         =                412
   engine type  =                 34
   engine ID    =                 35
diff --git a/src/test/nftest.2.out b/src/test/nftest.2.out
@@ -1187,7 +1187,7 @@ Flow Record:
   RecordCount  =                 33
   Ident        =          TestFlows
   Flags        =               0x00 NETFLOW v10, Unsampled
-  Elements     =                 18: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
+  Elements     =                 19: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
   size         =                412
   engine type  =                 34
   engine ID    =                 35
diff --git a/src/test/nftest.4.out b/src/test/nftest.4.out
@@ -1187,7 +1187,7 @@ Flow Record:
   RecordCount  =                 33
   Ident        =          TestFlows
   Flags        =               0x00 NETFLOW v10, Unsampled
-  Elements     =                 18: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
+  Elements     =                 19: 1 2 4 5 7 8 10 12 14 15 16 17 20 22 25 26 38 42 
   size         =                412
   engine type  =                 34
   engine ID    =                 35

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ static inline void ResolveMultipleIPrecords(recordHandle_t *handle, recordHeader`
`85`	`85`	`elementHeader_t elementHeader = (elementHeader_t )(skipElement - sizeof(elementHeader_t));`
`86`	`86`	`elementHeader->type = EXnull;`
`87`	`87`	`handle->extensionList[skipID] = NULL;`
`88`		`- recordHeaderV3->numElements--;`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`#ifdef DEVEL`
`@@ -117,6 +116,7 @@ static inline int MapRecordHandle(recordHandle_t handle, recordHeaderV3_t reco`
`117`	`116`	`if (elementHeader->type == 0) {`
`118`	`117`	`// Skip this record - advance to next record`
`119`	`118`	`elementHeader = (elementHeader_t )((void )elementHeader + elementHeader->length);`
	`119`	`+ num++;`
`120`	`120`	`continue;`
`121`	`121`	`}`
`122`	`122`	`if (elementHeader->type < MAXEXTENSIONS) {`