Skip to content

Commit a22dcf0

Browse files
committed
Cleanup filter code. Remove dead code
1 parent 13259cc commit a22dcf0

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

src/libnfdump/filter/filter.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ static uint64_t mpls_any_function(void *dataPtr, uint32_t length, data_t data, r
269269
// if no match above, trick filter to fail with an invalid mpls label value
270270
return 0xFF000000;
271271

272-
uint32_t offset = data.dataVal;
273-
return mplsLabel->mplsLabel[offset] >> 4;
274-
275272
} // End of mpls_any_function
276273

277274
static uint64_t pblock_function(void *dataPtr, uint32_t length, data_t data, recordHandle_t *handle) {
@@ -704,8 +701,9 @@ static void UpdateList(uint32_t a, uint32_t b) {
704701
static void ClearFilter(void) {
705702
NumBlocks = 1;
706703
Extended = 0;
707-
memset((void *)FilterTree, 0, MAXBLOCKS * sizeof(filterElement_t));
708-
} /* End of ClearFilter */
704+
size_t total = memblocks * MAXBLOCKS;
705+
memset(FilterTree, 0, total * sizeof(filterElement_t));
706+
} // End of ClearFilter
709707

710708
static void InitFilter(void) {
711709
memblocks = 1;
@@ -838,6 +836,7 @@ static int RunExtendedFilter(const FilterEngine_t *engine, recordHandle_t *handl
838836
break;
839837
case 8:
840838
inVal = *((uint64_t *)inPtr);
839+
break;
841840
case 3:
842841
case 5:
843842
case 7:

0 commit comments

Comments
 (0)