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

gen/bool: Use bool type instead of ints

Browse Source 
This commit converts usages of `int` to `bool` within the radix utility
code.
pull/9333/head
Jeff Lucovsky 2 years ago committed by Victor Julien
parent c666317038
commit 06158223d2
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -295,16 +295,14 @@ static int SCRadixPrefixNetmaskCount(SCRadixPrefix *prefix)
* *
* \param prefix Pointer to the ip prefix that is being checked. * \param prefix Pointer to the ip prefix that is being checked.
* \param netmask The netmask value for which we will have to return the user_data * \param netmask The netmask value for which we will have to return the user_data
* \param exact_match Bool flag which indicates if we should check if the prefix * \param exact_match flag which indicates if we should check if the prefix
* holds proper netblock(< 32 for ipv4 and < 128 for ipv6) or not. * holds proper netblock(< 32 for ipv4 and < 128 for ipv6) or not.
* *
* \retval 1 On match. * \retval 1 On match.
* \retval 0 On no match. * \retval 0 On no match.
*/ */
static int SCRadixPrefixContainNetmaskAndSetUserData(SCRadixPrefix *prefix, static int SCRadixPrefixContainNetmaskAndSetUserData(
uint16_t netmask, SCRadixPrefix *prefix, uint16_t netmask, bool exact_match, void **user_data_result)
int exact_match,
void **user_data_result)
{ {
SCRadixUserData *user_data = NULL; SCRadixUserData *user_data = NULL;
@ -1449,7 +1447,8 @@ static inline SCRadixNode *SCRadixFindKeyIPNetblock(
if (key_bitlen % 8 == 0 || if (key_bitlen % 8 == 0 ||
(node->prefix->stream[bytes] & mask) == (key_stream[bytes] & mask)) { (node->prefix->stream[bytes] & mask) == (key_stream[bytes] & mask)) {
if (SCRadixPrefixContainNetmaskAndSetUserData(node->prefix, netmask_node->netmasks[j], 0, user_data_result)) if (SCRadixPrefixContainNetmaskAndSetUserData(
node->prefix, netmask_node->netmasks[j], false, user_data_result))
return node; return node;
} }
} }
@ -1469,7 +1468,7 @@ static inline SCRadixNode *SCRadixFindKeyIPNetblock(
* \param netmask Netmask used during exact match * \param netmask Netmask used during exact match
*/ */
static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint8_t key_bitlen, uint8_t netmask, static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint8_t key_bitlen, uint8_t netmask,
SCRadixTree *tree, int exact_match, void **user_data_result) SCRadixTree *tree, bool exact_match, void **user_data_result)
{ {
if (tree == NULL || tree->head == NULL) if (tree == NULL || tree->head == NULL)
return NULL; return NULL;
@ -1506,7 +1505,7 @@ static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint8_t key_bitlen, uint
if (key_bitlen % 8 == 0 || if (key_bitlen % 8 == 0 ||
(node->prefix->stream[bytes] & mask) == (tmp_stream[bytes] & mask)) { (node->prefix->stream[bytes] & mask) == (tmp_stream[bytes] & mask)) {
if (SCRadixPrefixContainNetmaskAndSetUserData( if (SCRadixPrefixContainNetmaskAndSetUserData(
node->prefix, netmask, 1, user_data_result)) { node->prefix, netmask, true, user_data_result)) {
return node; return node;
} }
} }
@ -1530,7 +1529,7 @@ static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint8_t key_bitlen, uint
*/ */
SCRadixNode *SCRadixFindKeyIPV4ExactMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result) SCRadixNode *SCRadixFindKeyIPV4ExactMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result)
{ {
return SCRadixFindKey(key_stream, 32, 32, tree, 1, user_data_result); return SCRadixFindKey(key_stream, 32, 32, tree, true, user_data_result);
} }
/** /**
@ -1542,7 +1541,7 @@ SCRadixNode *SCRadixFindKeyIPV4ExactMatch(uint8_t *key_stream, SCRadixTree *tree
*/ */
SCRadixNode *SCRadixFindKeyIPV4BestMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result) SCRadixNode *SCRadixFindKeyIPV4BestMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result)
{ {
return SCRadixFindKey(key_stream, 32, 32, tree, 0, user_data_result); return SCRadixFindKey(key_stream, 32, 32, tree, false, user_data_result);
} }
/** /**
@ -1558,7 +1557,7 @@ SCRadixNode *SCRadixFindKeyIPV4Netblock(uint8_t *key_stream, SCRadixTree *tree,
#if defined(DEBUG_VALIDATION) || defined(UNITTESTS) #if defined(DEBUG_VALIDATION) || defined(UNITTESTS)
SCRadixValidateIPv4Key(key_stream, netmask); SCRadixValidateIPv4Key(key_stream, netmask);
#endif #endif
SCRadixNode *node = SCRadixFindKey(key_stream, 32, netmask, tree, 1, user_data_result); SCRadixNode *node = SCRadixFindKey(key_stream, 32, netmask, tree, true, user_data_result);
return node; return node;
} }
@ -1575,7 +1574,7 @@ SCRadixNode *SCRadixFindKeyIPV6Netblock(uint8_t *key_stream, SCRadixTree *tree,
#if defined(DEBUG_VALIDATION) || defined(UNITTESTS) #if defined(DEBUG_VALIDATION) || defined(UNITTESTS)
SCRadixValidateIPv6Key(key_stream, netmask); SCRadixValidateIPv6Key(key_stream, netmask);
#endif #endif
SCRadixNode *node = SCRadixFindKey(key_stream, 128, netmask, tree, 1, user_data_result); SCRadixNode *node = SCRadixFindKey(key_stream, 128, netmask, tree, true, user_data_result);
return node; return node;
} }
@ -1588,7 +1587,7 @@ SCRadixNode *SCRadixFindKeyIPV6Netblock(uint8_t *key_stream, SCRadixTree *tree,
*/ */
SCRadixNode *SCRadixFindKeyIPV6ExactMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result) SCRadixNode *SCRadixFindKeyIPV6ExactMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result)
{ {
return SCRadixFindKey(key_stream, 128, 128, tree, 1, user_data_result); return SCRadixFindKey(key_stream, 128, 128, tree, true, user_data_result);
} }
/** /**
@ -1600,7 +1599,7 @@ SCRadixNode *SCRadixFindKeyIPV6ExactMatch(uint8_t *key_stream, SCRadixTree *tree
*/ */
SCRadixNode *SCRadixFindKeyIPV6BestMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result) SCRadixNode *SCRadixFindKeyIPV6BestMatch(uint8_t *key_stream, SCRadixTree *tree, void **user_data_result)
{ {
return SCRadixFindKey(key_stream, 128, 128, tree, 0, user_data_result); return SCRadixFindKey(key_stream, 128, 128, tree, false, user_data_result);
} }
/** /**

Write Preview
Loading…
Cancel
Save