diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c index fadba988e1..3d9b46427f 100644 --- a/src/detect-byte-extract.c +++ b/src/detect-byte-extract.c @@ -615,13 +615,13 @@ int DetectByteExtractSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) DETECT_BYTEJUMP, s->sm_lists_tail[DETECT_SM_LIST_DMATCH]); if (pm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (dm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (pm->idx > dm->idx) { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } } else { if (data->flags & DETECT_BYTE_EXTRACT_FLAG_RELATIVE) { diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c index 627bafeb3a..94856b034a 100644 --- a/src/detect-bytejump.c +++ b/src/detect-bytejump.c @@ -596,13 +596,13 @@ int DetectBytejumpSetup(DetectEngineCtx *de_ctx, Signature *s, char *optstr) DETECT_BYTEJUMP, s->sm_lists_tail[DETECT_SM_LIST_DMATCH]); if (pm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (dm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (pm->idx > dm->idx) { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } } else { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c index ecb8ddd85d..1ccd88cc9b 100644 --- a/src/detect-bytetest.c +++ b/src/detect-bytetest.c @@ -520,13 +520,13 @@ int DetectBytetestSetup(DetectEngineCtx *de_ctx, Signature *s, char *optstr) DETECT_BYTEJUMP, s->sm_lists_tail[DETECT_SM_LIST_DMATCH]); if (pm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (dm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (pm->idx > dm->idx) { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } } else { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c index 3ec3942e64..b1ad15656f 100644 --- a/src/detect-isdataat.c +++ b/src/detect-isdataat.c @@ -277,13 +277,13 @@ int DetectIsdataatSetup (DetectEngineCtx *de_ctx, Signature *s, char *isdataatst DETECT_BYTEJUMP, s->sm_lists_tail[DETECT_SM_LIST_DMATCH]); if (pm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (dm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (pm->idx > dm->idx) { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } prev_pm = SigMatchGetLastSMFromLists(s, 6, DETECT_CONTENT, sm->prev, diff --git a/src/detect-parse.c b/src/detect-parse.c index 76950c3606..32792a0ff5 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -173,27 +173,6 @@ void SigMatchAppendSMToList(Signature *s, SigMatch *new, int list) s->sm_cnt++; } -void SigMatchAppendDcePayload(Signature *s, SigMatch *new) { - SCLogDebug("Append SigMatch against s->sm_lists[DETECT_SM_LIST_DMATCH](dce) list"); - if (s->sm_lists[DETECT_SM_LIST_DMATCH] == NULL) { - s->sm_lists[DETECT_SM_LIST_DMATCH] = new; - s->sm_lists_tail[DETECT_SM_LIST_DMATCH] = new; - new->next = NULL; - new->prev = NULL; - } else { - SigMatch *cur = s->sm_lists_tail[DETECT_SM_LIST_DMATCH]; - cur->next = new; - new->prev = cur; - new->next = NULL; - s->sm_lists_tail[DETECT_SM_LIST_DMATCH] = new; - } - - new->idx = s->sm_cnt; - s->sm_cnt++; - - return; -} - /** \brief Append a sig match to the signatures tag match list * This is done on other list because the tag keyword * should be always the last inspected (never ordered) diff --git a/src/detect-parse.h b/src/detect-parse.h index e17eae12e6..e84185a864 100644 --- a/src/detect-parse.h +++ b/src/detect-parse.h @@ -57,7 +57,6 @@ void SigMatchReplace(Signature *, SigMatch *, SigMatch *); void SigMatchReplaceContent(Signature *, SigMatch *, SigMatch *); void SigMatchReplaceContentToUricontent(Signature *, SigMatch *, SigMatch *); -void SigMatchAppendDcePayload(Signature *, SigMatch *); void SigMatchAppendPacket(Signature *, SigMatch *); void SigMatchAppendThreshold(Signature *, SigMatch *); void SigMatchAppendPostMatch(Signature *, SigMatch *); diff --git a/src/detect-pcre.c b/src/detect-pcre.c index 1a9d3d38f9..89deda319f 100644 --- a/src/detect-pcre.c +++ b/src/detect-pcre.c @@ -1176,13 +1176,13 @@ static int DetectPcreSetup (DetectEngineCtx *de_ctx, Signature *s, char *regexst DETECT_BYTEJUMP, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]); if (pm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (dm == NULL) { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } else if (pm->idx > dm->idx) { SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendDcePayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_DMATCH); } } else { if (s->init_flags & SIG_FLAG_INIT_FILE_DATA) {