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

change the netmask to uint8_t for the ip handling part of the radix tree and also use 255 instead of -1 to indicate the absence of a netblock

Browse Source
remotes/origin/master-1.0.x
Anoop Saldanha 16 years ago committed by Victor Julien
parent 3f91af89a2
commit 96614c60f2
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

5
src/defrag.c
Unescape Escape View File

@ -672,8 +672,8 @@ Defrag4Reassemble(ThreadVars *tv, DefragContext *dc, DefragTracker *tracker,
Frag *frag, *prev = NULL;
Packet *rp = NULL;
int offset = 0;
int hlen;
int len;
int hlen = 0;
int len = 0;
/* Lock the tracker. */
mutex_lock(&tracker->lock);
@ -683,7 +683,6 @@ Defrag4Reassemble(ThreadVars *tv, DefragContext *dc, DefragTracker *tracker,
return NULL;
/* Check that we have all the data. */
len = 0;
TAILQ_FOREACH(frag, &tracker->frags, next) {
if (frag == TAILQ_FIRST(&tracker->frags)) {
/* First frag should have an offset of 0. */

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

@ -30,7 +30,7 @@
*/
static SCRadixPrefix *SCRadixCreatePrefix(uint8_t *key_stream,
uint16_t key_bitlen, void *user,
int netmask)
uint8_t netmask)
{
SCRadixPrefix *prefix = NULL;
@ -183,13 +183,13 @@ void SCRadixReleaseRadixTree(SCRadixTree *tree)
* \param tree Pointer to the Radix tree
* \param user Pointer to the user data that has to be associated with
* this key
* \param netmask The netmask if we are adding an IP netblock; -1 if we are
* \param netmask The netmask if we are adding an IP netblock; 255 if we are
* not adding an IP netblock
*
* \retval node Pointer to the newly created node
*/
static SCRadixNode *SCRadixAddKey(uint8_t *key_stream, uint16_t key_bitlen,
SCRadixTree *tree, void *user, int netmask)
SCRadixTree *tree, void *user, uint8_t netmask)
{
SCRadixNode *node = NULL;
SCRadixNode *new_node = NULL;
@ -312,7 +312,7 @@ static SCRadixNode *SCRadixAddKey(uint8_t *key_stream, uint16_t key_bitlen,
return node;
node->prefix = SCRadixCreatePrefix(prefix->stream, prefix->bitlen, NULL,
-1);
255);
return node;
}
@ -380,7 +380,7 @@ static SCRadixNode *SCRadixAddKey(uint8_t *key_stream, uint16_t key_bitlen,
node->parent = inter_node;
}
if (netmask != -1) {
if (netmask != 255) {
node = new_node;
parent = new_node->parent;
while (parent != NULL && netmask < (parent->bit + 1)) {
@ -431,7 +431,7 @@ static SCRadixNode *SCRadixAddKey(uint8_t *key_stream, uint16_t key_bitlen,
SCRadixNode *SCRadixAddKeyGeneric(uint8_t *key_stream, uint16_t key_bitlen,
SCRadixTree *tree, void *user)
{
SCRadixNode *node = SCRadixAddKey(key_stream, key_bitlen, tree, user, -1);
SCRadixNode *node = SCRadixAddKey(key_stream, key_bitlen, tree, user, 255);
return node;
}
@ -450,7 +450,7 @@ SCRadixNode *SCRadixAddKeyGeneric(uint8_t *key_stream, uint16_t key_bitlen,
SCRadixNode *SCRadixAddKeyIPV4(uint8_t *key_stream, SCRadixTree *tree,
void *user)
{
SCRadixNode *node = SCRadixAddKey(key_stream, 32, tree, user, -1);
SCRadixNode *node = SCRadixAddKey(key_stream, 32, tree, user, 255);
return node;
}
@ -469,7 +469,7 @@ SCRadixNode *SCRadixAddKeyIPV4(uint8_t *key_stream, SCRadixTree *tree,
SCRadixNode *SCRadixAddKeyIPV6(uint8_t *key_stream, SCRadixTree *tree,
void *user)
{
SCRadixNode *node = SCRadixAddKey(key_stream, 128, tree, user, -1);
SCRadixNode *node = SCRadixAddKey(key_stream, 128, tree, user, 255);
return node;
}
@ -487,7 +487,7 @@ SCRadixNode *SCRadixAddKeyIPV6(uint8_t *key_stream, SCRadixTree *tree,
* \retval node Pointer to the newly created node
*/
SCRadixNode *SCRadixAddKeyIPV4Netblock(uint8_t *key_stream, SCRadixTree *tree,
void *user, int netmask)
void *user, uint8_t netmask)
{
SCRadixNode *node = SCRadixAddKey(key_stream, 32, tree, user, netmask);
@ -507,7 +507,7 @@ SCRadixNode *SCRadixAddKeyIPV4Netblock(uint8_t *key_stream, SCRadixTree *tree,
* \retval node Pointer to the newly created node
*/
SCRadixNode *SCRadixAddKeyIPV6Netblock(uint8_t *key_stream, SCRadixTree *tree,
void *user, int netmask)
void *user, uint8_t netmask)
{
SCRadixNode *node = SCRadixAddKey(key_stream, 128, tree, user, netmask);
@ -538,7 +538,7 @@ static void SCRadixRemoveKey(uint8_t *key_stream, uint16_t key_bitlen,
if (node == NULL)
return;
if ( (prefix = SCRadixCreatePrefix(key_stream, key_bitlen, NULL, -1)) == NULL)
if ( (prefix = SCRadixCreatePrefix(key_stream, key_bitlen, NULL, 255)) == NULL)
return;
while (node->bit < prefix->bitlen) {
@ -651,7 +651,6 @@ void SCRadixRemoveKeyIPV6(uint8_t *key_stream, SCRadixTree *tree)
return SCRadixRemoveKey(key_stream, 128, tree);
}
/**
* \brief Checks if an IP prefix falls under a netblock, in the path to the root
* of the tree, from the node. Used internally by SCRadixFindKey()
@ -738,7 +737,7 @@ static SCRadixNode *SCRadixFindKey(uint8_t *key_stream, uint16_t key_bitlen,
if (tree->head == NULL)
return NULL;
if ( (prefix = SCRadixCreatePrefix(key_stream, key_bitlen, NULL, -1)) == NULL)
if ( (prefix = SCRadixCreatePrefix(key_stream, key_bitlen, NULL, 255)) == NULL)
return NULL;
while (node->bit < prefix->bitlen) {

12
src/util-radix-tree.h
Unescape Escape View File

@ -18,8 +18,8 @@ typedef struct SCRadixPrefix_ {
uint8_t *stream;
/* if this is a prefix that holds a netblock, this field holds the
* netmask, -1 otherwise */
int netmask;
* netmask, 255 otherwise */
uint8_t netmask;
/* any user data that has to be associated with this key */
void *user;
@ -34,7 +34,7 @@ typedef struct SCRadixNode_ {
uint16_t bit;
/* holds a list of netmaks that come under this node in the tree */
int *netmasks;
uint8_t *netmasks;
/* total no of netmasks that are registered under this node */
int netmask_cnt;
@ -67,8 +67,10 @@ void SCRadixReleaseRadixTree(SCRadixTree *);
SCRadixNode *SCRadixAddKeyGeneric(uint8_t *, uint16_t, SCRadixTree *, void *);
SCRadixNode *SCRadixAddKeyIPV4(uint8_t *, SCRadixTree *, void *);
SCRadixNode *SCRadixAddKeyIPV6(uint8_t *, SCRadixTree *, void *);
SCRadixNode *SCRadixAddKeyIPV4Netblock(uint8_t *, SCRadixTree *, void *, int);
SCRadixNode *SCRadixAddKeyIPV6Netblock(uint8_t *, SCRadixTree *, void *, int);
SCRadixNode *SCRadixAddKeyIPV4Netblock(uint8_t *, SCRadixTree *, void *,
uint8_t);
SCRadixNode *SCRadixAddKeyIPV6Netblock(uint8_t *, SCRadixTree *, void *,
uint8_t);
void SCRadixRemoveKeyGeneric(uint8_t *, uint16_t, SCRadixTree *);
void SCRadixRemoveKeyIPV4(uint8_t *, SCRadixTree *);

Write Preview
Loading…
Cancel
Save