From c9af50ea0cb034ca910a6e03506f311680725a5f Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Sat, 18 Feb 2012 14:00:39 +0530 Subject: [PATCH] code cleanup - replace SigMatchAppendAppLayer with SigMatchAppendSMToList --- src/detect-app-layer-event.c | 2 +- src/detect-dce-iface.c | 2 +- src/detect-dce-opnum.c | 2 +- src/detect-dce-stub-data.c | 2 +- src/detect-ftpbounce.c | 2 +- src/detect-parse.c | 23 ----------------------- src/detect-parse.h | 1 - src/detect-ssh-proto-version.c | 2 +- src/detect-ssh-software-version.c | 2 +- src/detect-ssl-state.c | 2 +- src/detect-ssl-version.c | 2 +- src/detect-tls-version.c | 2 +- 12 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c index 54bbe79d6b..ba90c87baf 100644 --- a/src/detect-app-layer-event.c +++ b/src/detect-app-layer-event.c @@ -158,7 +158,7 @@ int DetectAppLayerEventSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) s->alproto = ((DetectAppLayerEventData *)sm->ctx)->alproto; } - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); s->flags |= SIG_FLAG_APPLAYER; return 0; diff --git a/src/detect-dce-iface.c b/src/detect-dce-iface.c index 0ae50a37b3..82c72f8fd0 100644 --- a/src/detect-dce-iface.c +++ b/src/detect-dce-iface.c @@ -367,7 +367,7 @@ static int DetectDceIfaceSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) sm->type = DETECT_DCE_IFACE; sm->ctx = (void *)did; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_DCERPC) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-dce-opnum.c b/src/detect-dce-opnum.c index 2f8aa99526..64a25e9d8e 100644 --- a/src/detect-dce-opnum.c +++ b/src/detect-dce-opnum.c @@ -320,7 +320,7 @@ static int DetectDceOpnumSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) sm->type = DETECT_DCE_OPNUM; sm->ctx = (void *)dod; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_DCERPC) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c index 47862074fc..fe97aa0b33 100644 --- a/src/detect-dce-stub-data.c +++ b/src/detect-dce-stub-data.c @@ -130,7 +130,7 @@ static int DetectDceStubDataSetup(DetectEngineCtx *de_ctx, Signature *s, char *a sm->type = DETECT_DCE_STUB_DATA; sm->ctx = NULL; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_DCERPC) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c index 6bcf31e470..b5ee39df3e 100644 --- a/src/detect-ftpbounce.c +++ b/src/detect-ftpbounce.c @@ -266,7 +266,7 @@ int DetectFtpbounceSetup(DetectEngineCtx *de_ctx, Signature *s, char *ftpbounces */ sm->ctx = NULL; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_FTP) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-parse.c b/src/detect-parse.c index caad3e8ea7..1fff1f1a6c 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -147,29 +147,6 @@ SigTableElmt *SigTableGet(char *name) { return NULL; } -/** - * \brief append a app layer SigMatch to the Signature structure - * \param s pointer to the Signature - * \param new pointer to the SigMatch of type uricontent to be appended - */ -void SigMatchAppendAppLayer(Signature *s, SigMatch *new) { - if (s->sm_lists[DETECT_SM_LIST_AMATCH] == NULL) { - s->sm_lists[DETECT_SM_LIST_AMATCH] = new; - s->sm_lists_tail[DETECT_SM_LIST_AMATCH] = new; - new->next = NULL; - new->prev = NULL; - } else { - SigMatch *cur = s->sm_lists_tail[DETECT_SM_LIST_AMATCH]; - cur->next = new; - new->prev = cur; - new->next = NULL; - s->sm_lists_tail[DETECT_SM_LIST_AMATCH] = new; - } - - new->idx = s->sm_cnt; - s->sm_cnt++; -} - /** * \brief Append a SigMatch to the list type. * diff --git a/src/detect-parse.h b/src/detect-parse.h index 7392762e34..534bf6656e 100644 --- a/src/detect-parse.h +++ b/src/detect-parse.h @@ -63,7 +63,6 @@ void SigMatchAppendPacket(Signature *, SigMatch *); void SigMatchAppendThreshold(Signature *, SigMatch *); void SigMatchAppendPostMatch(Signature *, SigMatch *); void SigMatchAppendUricontent(Signature *, SigMatch *); -void SigMatchAppendAppLayer(Signature *, SigMatch *); void SigMatchAppendTag(Signature *, SigMatch *); void SigMatchAppendSMToList(Signature *, SigMatch *, int); void SigMatchRemoveSMFromList(Signature *, SigMatch *, int); diff --git a/src/detect-ssh-proto-version.c b/src/detect-ssh-proto-version.c index f55ee67f16..f736a60d2f 100644 --- a/src/detect-ssh-proto-version.c +++ b/src/detect-ssh-proto-version.c @@ -247,7 +247,7 @@ static int DetectSshVersionSetup (DetectEngineCtx *de_ctx, Signature *s, char *s sm->type = DETECT_AL_SSH_PROTOVERSION; sm->ctx = (void *)ssh; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_SSH) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-ssh-software-version.c b/src/detect-ssh-software-version.c index d68ca1c952..1583006276 100644 --- a/src/detect-ssh-software-version.c +++ b/src/detect-ssh-software-version.c @@ -225,7 +225,7 @@ static int DetectSshSoftwareVersionSetup (DetectEngineCtx *de_ctx, Signature *s, sm->type = DETECT_AL_SSH_SOFTWAREVERSION; sm->ctx = (void *)ssh; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_SSH) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-ssl-state.c b/src/detect-ssl-state.c index e347f186e8..07f543bdae 100644 --- a/src/detect-ssl-state.c +++ b/src/detect-ssl-state.c @@ -312,7 +312,7 @@ int DetectSslStateSetup(DetectEngineCtx *de_ctx, Signature *s, char *arg) } s->alproto = ALPROTO_TLS; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); return 0; diff --git a/src/detect-ssl-version.c b/src/detect-ssl-version.c index 961773ed73..a1a943b513 100644 --- a/src/detect-ssl-version.c +++ b/src/detect-ssl-version.c @@ -312,7 +312,7 @@ static int DetectSslVersionSetup (DetectEngineCtx *de_ctx, Signature *s, char *s sm->type = DETECT_AL_SSL_VERSION; sm->ctx = (void *)ssl; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords."); diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c index a5f08b7b1b..a9f4b8af74 100644 --- a/src/detect-tls-version.c +++ b/src/detect-tls-version.c @@ -246,7 +246,7 @@ static int DetectTlsVersionSetup (DetectEngineCtx *de_ctx, Signature *s, char *s sm->type = DETECT_AL_TLS_VERSION; sm->ctx = (void *)tls; - SigMatchAppendAppLayer(s, sm); + SigMatchAppendSMToList(s, sm, DETECT_SM_LIST_AMATCH); if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS) { SCLogError(SC_ERR_CONFLICTING_RULE_KEYWORDS, "rule contains conflicting keywords.");