/**
* \brief Alloc a DetectPort structure and update counters
*
- * \retval sgh Pointer to the newly created DetectPort on success; or NULL in
- * case of error.
+ * \retval dp newly created DetectPort on success; or NULL in case of error.
*/
static DetectPort *DetectPortInit(void)
{
- DetectPort *dp = SCMalloc(sizeof(DetectPort));
+ DetectPort *dp = SCCalloc(1, sizeof(DetectPort));
if (unlikely(dp == NULL))
return NULL;
- memset(dp, 0, sizeof(DetectPort));
-
return dp;
}
}
}
-/**
- * \brief Copy and insert the new DetectPort, with a copy list of sigs
- *
- * \param de_ctx Pointer to the current detection engine context
- * \param head Pointer to the DetectPort list head
- * \param new Pointer to DetectPort to search in the DetectPort list
- *
- * \retval 0 if dp is added correctly
- */
-int DetectPortInsertCopy(DetectEngineCtx *de_ctx, DetectPort **head,
- DetectPort *new)
-{
- DetectPort *copy = DetectPortCopySingle(de_ctx,new);
- if (copy == NULL)
- return -1;
-
- return DetectPortInsert(de_ctx, head, copy);
-}
-
/**
* \brief function for inserting a port group object. This also makes sure
* SigGroupContainer lists are handled correctly.
* \retval 1 inserted
* \retval 0 not inserted, memory of new is freed
* \retval -1 error
+ *
+ * \todo rewrite to avoid recursive calls
* */
int DetectPortInsert(DetectEngineCtx *de_ctx, DetectPort **head,
DetectPort *new)
//BUG_ON(new->next != NULL);
//BUG_ON(new->prev != NULL);
- /* see if it already exists or overlaps with existing ag's */
+ /* see if it already exists or overlaps with existing ports */
if (*head != NULL) {
DetectPort *cur = NULL;
int r = 0;
uint32_t a_port2 = a->port2;
uint32_t b_port1 = b->port;
uint32_t b_port2 = b->port2;
- DetectPort *tmp = NULL;
/* default to NULL */
*c = NULL;
BUG_ON(r != PORT_ES && r != PORT_EB && r != PORT_LE && r != PORT_GE);
/* get a place to temporary put sigs lists */
- tmp = DetectPortInit();
+ DetectPort *tmp = DetectPortInit();
if (tmp == NULL) {
goto error;
}
- memset(tmp, 0, sizeof(DetectPort));
/**
* We have 3 parts: [aaa[abab]bbb]
b->port = b_port1;
b->port2 = a_port2;
- DetectPort *tmp_c;
- tmp_c = DetectPortInit();
+ DetectPort *tmp_c = DetectPortInit();
if (tmp_c == NULL) {
goto error;
}
b->port = a_port1;
b->port2 = b_port2;
- DetectPort *tmp_c;
- tmp_c = DetectPortInit();
+ DetectPort *tmp_c = DetectPortInit();
if (tmp_c == NULL) {
goto error;
}
b->port = a_port1;
b->port2 = a_port2;
- DetectPort *tmp_c;
- tmp_c = DetectPortInit();
+ DetectPort *tmp_c = DetectPortInit();
if (tmp_c == NULL) {
goto error;
}
b->port = b_port1;
b->port2 = b_port2;
- DetectPort *tmp_c;
- tmp_c = DetectPortInit();
+ DetectPort *tmp_c = DetectPortInit();
if (tmp_c == NULL) {
goto error;
}
DetectPort *tmp_b;
tmp_b = DetectPortInit();
if (tmp_b == NULL) {
- goto error;
+ return -1;
}
tmp_b->port = a_port2 + 1;
a->port = 0x0000;
a->port2 = a_port1 - 1;
} else {
- goto error;
+ return -1;
}
return 0;
-
-error:
- return -1;
}
/**
DetectPort *dst = DetectPortInit();
if (dst == NULL) {
- goto error;
+ return NULL;
}
dst->port = src->port;
dst->port2 = src->port2;
SigGroupHeadCopySigs(de_ctx,src->sh,&dst->sh);
-
return dst;
-error:
- return NULL;
}
/**
* \retval Pointer to the DetectPort group of our port if it matched
* \retval NULL if port is not in the list
* */
-DetectPort *
-DetectPortLookupGroup(DetectPort *dp, uint16_t port)
+DetectPort *DetectPortLookupGroup(DetectPort *dp, uint16_t port)
{
- DetectPort *p = dp;
-
if (dp == NULL)
return NULL;
- for ( ; p != NULL; p = p->next) {
- if (DetectPortMatch(p,port) == 1) {
+ for (DetectPort *p = dp; p != NULL; p = p->next) {
+ if (DetectPortMatch(p, port) == 1) {
//SCLogDebug("match, port %" PRIu32 ", dp ", port);
//DetectPortPrint(p); SCLogDebug("");
return p;
return NULL;
}
-/**
- * \brief Used to check if a DetectPort list contains an instance with
- * a similar DetectPort. The comparison done is not the one that
- * checks the memory for the same instance, but one that checks that the
- * two instances hold the same content.
- *
- * \param head Pointer to the DetectPort list.
- * \param ad Pointer to the DetectPort that has to be checked for in
- * the DetectPort list.
- *
- * \retval cur Returns a pointer to the DetectPort on a match; NULL if
- * no match.
- */
-DetectPort *DetectPortLookupInList(DetectPort *head, DetectPort *gr)
-{
- DetectPort *cur;
-
- if (head != NULL) {
- for (cur = head; cur != NULL; cur = cur->next) {
- if (DetectPortCmp(cur, gr) == PORT_EQ)
- return cur;
- }
- }
-
- return NULL;
-}
-
-/**
- * \brief Function to join the source group to the target and its members
- *
- * \param de_ctx Pointer to the current Detection Engine Context
- * \param target Pointer to DetectPort group where the source is joined
- * \param source Pointer to DetectPort group that will join into the target
- *
- * \retval -1 on error
- * \retval 0 on success
- * */
-int DetectPortJoin(DetectEngineCtx *de_ctx, DetectPort *target,
- DetectPort *source)
-{
- if (target == NULL || source == NULL)
- return -1;
-
- SigGroupHeadCopySigs(de_ctx,source->sh,&target->sh);
-
- if (source->port < target->port)
- target->port = source->port;
-
- if (source->port2 > target->port2)
- target->port2 = source->port2;
-
- return 0;
-}
-
/**
* \brief Checks if two port group lists are equal.
*
int DetectPortParse(const DetectEngineCtx *de_ctx,
DetectPort **head, const char *str)
{
- int r;
-
SCLogDebug("Port string to be parsed - str %s", str);
/* negate port list */
DetectPort *nhead = NULL;
- r = DetectPortParseDo(de_ctx, head, &nhead, str,/* start with negate no */0, NULL);
+ int r = DetectPortParseDo(de_ctx, head, &nhead, str,
+ /* start with negate no */ 0, NULL);
if (r < 0)
goto error;
DetectPort *PortParse(const char *str)
{
char *port2 = NULL;
- DetectPort *dp = NULL;
-
char portstr[16];
strlcpy(portstr, str, sizeof(portstr));
- dp = DetectPortInit();
+ DetectPort *dp = DetectPortInit();
if (dp == NULL)
goto error;
port2[0] = '\0';
port2++;
- if(DetectPortIsValidRange(port))
+ if (DetectPortIsValidRange(port))
dp->port = atoi(port);
else
goto error;
else
return 0;
}
+
/********************** End parsing routines ********************/
/* hash table */
static uint32_t DetectPortHashFunc(HashListTable *ht, void *data, uint16_t datalen)
{
DetectPort *p = (DetectPort *)data;
- uint32_t hash = 0;
-
- SCLogDebug("hashing sgh %p", p);
+ SCLogDebug("hashing port %p", p);
- hash = ((uint32_t)p->port << 16) | p->port2;
+ uint32_t hash = ((uint32_t)p->port << 16) | p->port2;
hash %= ht->array_size;
SCLogDebug("hash %"PRIu32, hash);
DetectPortCompareFunc,
DetectPortHashFreeFunc);
if (de_ctx->dport_hash_table == NULL)
- goto error;
+ return -1;
return 0;
-
-error:
- return -1;
}
/**
return result;
}
-#endif /* UNITTESTS */
-
void DetectPortTests(void)
{
-#ifdef UNITTESTS
UtRegisterTest("PortTestParse01", PortTestParse01);
UtRegisterTest("PortTestParse02", PortTestParse02);
UtRegisterTest("PortTestParse03", PortTestParse03);
UtRegisterTest("PortTestMatchReal18", PortTestMatchReal18);
UtRegisterTest("PortTestMatchReal19", PortTestMatchReal19);
UtRegisterTest("PortTestMatchDoubleNegation", PortTestMatchDoubleNegation);
-
+}
#endif /* UNITTESTS */
-}
projects / thirdparty / suricata.git / commitdiff
