From 6cab663bf0b5ff51552e5b64c90542885a27bc14 Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Sat, 18 Feb 2012 14:51:17 +0530 Subject: [PATCH] code cleanup - replace SigMatchAppendPayload with SigMatchAppendSMToList --- src/detect-byte-extract.c | 6 +++--- src/detect-bytejump.c | 4 ++-- src/detect-bytetest.c | 4 ++-- src/detect-content.c | 2 +- src/detect-isdataat.c | 4 ++-- src/detect-parse.c | 18 ------------------ src/detect-parse.h | 1 - src/detect-pcre.c | 4 ++-- 8 files changed, 12 insertions(+), 31 deletions(-) diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c index 5743803d44..fadba988e1 100644 --- a/src/detect-byte-extract.c +++ b/src/detect-byte-extract.c @@ -619,7 +619,7 @@ int DetectByteExtractSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) } else if (dm == NULL) { SigMatchAppendDcePayload(s, sm); } else if (pm->idx > dm->idx) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { SigMatchAppendDcePayload(s, sm); } @@ -651,9 +651,9 @@ int DetectByteExtractSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) if (list == DETECT_SM_LIST_UMATCH) SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_UMATCH); else - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } } diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c index 7a44393491..627bafeb3a 100644 --- a/src/detect-bytejump.c +++ b/src/detect-bytejump.c @@ -600,12 +600,12 @@ int DetectBytejumpSetup(DetectEngineCtx *de_ctx, Signature *s, char *optstr) } else if (dm == NULL) { SigMatchAppendDcePayload(s, sm); } else if (pm->idx > dm->idx) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { SigMatchAppendDcePayload(s, sm); } } else { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } if (offset != NULL) { diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c index 354bd1a18a..ecb8ddd85d 100644 --- a/src/detect-bytetest.c +++ b/src/detect-bytetest.c @@ -524,12 +524,12 @@ int DetectBytetestSetup(DetectEngineCtx *de_ctx, Signature *s, char *optstr) } else if (dm == NULL) { SigMatchAppendDcePayload(s, sm); } else if (pm->idx > dm->idx) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { SigMatchAppendDcePayload(s, sm); } } else { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } if (value != NULL) { diff --git a/src/detect-content.c b/src/detect-content.c index 7f4da628bd..27bf6959fd 100644 --- a/src/detect-content.c +++ b/src/detect-content.c @@ -406,7 +406,7 @@ static int DetectContentSetup (DetectEngineCtx *de_ctx, Signature *s, char *cont DetectContentPrint(cd); - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); if (s->init_flags & SIG_FLAG_INIT_FILE_DATA) { cd->id = DetectPatternGetId(de_ctx->mpm_pattern_id_store, cd, DETECT_SM_LIST_HSBDMATCH); diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c index b283167246..3ec3942e64 100644 --- a/src/detect-isdataat.c +++ b/src/detect-isdataat.c @@ -281,7 +281,7 @@ int DetectIsdataatSetup (DetectEngineCtx *de_ctx, Signature *s, char *isdataatst } else if (dm == NULL) { SigMatchAppendDcePayload(s, sm); } else if (pm->idx > dm->idx) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { SigMatchAppendDcePayload(s, sm); } @@ -334,7 +334,7 @@ int DetectIsdataatSetup (DetectEngineCtx *de_ctx, Signature *s, char *isdataatst prev_pm = pm; } else { if (!(idad->flags & ISDATAAT_RELATIVE)) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); if (offset != NULL) { SigMatch *bed_sm = DetectByteExtractRetrieveSMVar(offset, s, diff --git a/src/detect-parse.c b/src/detect-parse.c index 5918c4e71a..76950c3606 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -173,24 +173,6 @@ void SigMatchAppendSMToList(Signature *s, SigMatch *new, int list) s->sm_cnt++; } -void SigMatchAppendPayload(Signature *s, SigMatch *new) { - if (s->sm_lists[DETECT_SM_LIST_PMATCH] == NULL) { - s->sm_lists[DETECT_SM_LIST_PMATCH] = new; - s->sm_lists_tail[DETECT_SM_LIST_PMATCH] = new; - new->next = NULL; - new->prev = NULL; - } else { - SigMatch *cur = s->sm_lists_tail[DETECT_SM_LIST_PMATCH]; - cur->next = new; - new->prev = cur; - new->next = NULL; - s->sm_lists_tail[DETECT_SM_LIST_PMATCH] = new; - } - - new->idx = s->sm_cnt; - 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) { diff --git a/src/detect-parse.h b/src/detect-parse.h index b9c40fc3fc..e17eae12e6 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 SigMatchAppendPayload(Signature *, SigMatch *); void SigMatchAppendDcePayload(Signature *, SigMatch *); void SigMatchAppendPacket(Signature *, SigMatch *); void SigMatchAppendThreshold(Signature *, SigMatch *); diff --git a/src/detect-pcre.c b/src/detect-pcre.c index 3145e5752d..1a9d3d38f9 100644 --- a/src/detect-pcre.c +++ b/src/detect-pcre.c @@ -1180,7 +1180,7 @@ static int DetectPcreSetup (DetectEngineCtx *de_ctx, Signature *s, char *regexst } else if (dm == NULL) { SigMatchAppendDcePayload(s, sm); } else if (pm->idx > dm->idx) { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } else { SigMatchAppendDcePayload(s, sm); } @@ -1192,7 +1192,7 @@ static int DetectPcreSetup (DetectEngineCtx *de_ctx, Signature *s, char *regexst SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_HSBDMATCH); } else { - SigMatchAppendPayload(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_PMATCH); } } }