aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

radix: cleanup test

Browse Source
pull/7018/head
Victor Julien 3 years ago
parent 89b7ac0a60
commit d04dface20
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File

30
src/util-radix-tree.c
Unescape Escape View File

@ -2525,7 +2525,6 @@ static int SCRadixTestIPV4NetblockInsertion10(void)
SCRadixTree *tree = NULL;
SCRadixNode *node[2];
struct sockaddr_in servaddr;
int result = 1;
tree = SCRadixCreateRadixTree(free, NULL);
@ -2568,8 +2567,7 @@ static int SCRadixTestIPV4NetblockInsertion10(void)
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.0", &servaddr.sin_addr) <= 0)
return 0;
node[0] = SCRadixAddKeyIPV4Netblock((uint8_t *)&servaddr.sin_addr, tree, NULL,
24);
node[0] = SCRadixAddKeyIPV4Netblock((uint8_t *)&servaddr.sin_addr, tree, NULL, 24);
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.45", &servaddr.sin_addr) <= 0)
@ -2585,26 +2583,34 @@ static int SCRadixTestIPV4NetblockInsertion10(void)
return 0;
SCRadixAddKeyIPV4Netblock((uint8_t *)&servaddr.sin_addr, tree, NULL, 16);
SCRadixPrintTree(tree);
/* test for the existance of a key */
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.53", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == node[0]);
SCRadixNode *found = SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT(found == node[0]);
SCLogDebug("search \"exact\" match for 192.171.128.45");
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.45", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4ExactMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == node[1]);
found = SCRadixFindKeyIPV4ExactMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT(found == node[1]);
SCLogDebug("search \"best\" match for 192.171.128.45");
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.45", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == node[1]);
found = SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT(found == node[1]);
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.78", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == node[0]);
found = SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT(found == node[0]);
/* let us remove a netblock */
memset(&servaddr, 0, sizeof(servaddr));
@ -2615,16 +2621,16 @@ static int SCRadixTestIPV4NetblockInsertion10(void)
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.128.78", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == NULL);
found = SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT_NULL(found);
memset(&servaddr, 0, sizeof(servaddr));
if (inet_pton(AF_INET, "192.171.127.78", &servaddr.sin_addr) <= 0)
return 0;
result &= (SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL) == NULL);
found = SCRadixFindKeyIPV4BestMatch((uint8_t *)&servaddr.sin_addr, tree, NULL);
FAIL_IF_NOT_NULL(found);
SCRadixReleaseRadixTree(tree);
return result;
PASS;
}
static int SCRadixTestIPV4NetblockInsertion11(void)

Write Preview
Loading…
Cancel
Save