code cleanup - replace SigMatchAppendAppLayer with SigMatchAppendSMToList

diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index 54bbe79d6bd1b0c90b8e7c377ac7a1527ad124b5..ba90c87baf674ef0f96d3df62b8d2a3a5c09a8ee 100644 (file)
--- 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 0ae50a37b3a319958d609824ff1a52c424e47bc3..82c72f8fd0e894efe8cf3eb031892f936a0a5504 100644 (file)
--- 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 2f8aa9952658945a9ace50711accb7f621f61d06..64a25e9d8e33e94e5ab9a506928f4347afb54313 100644 (file)
--- 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 47862074fcc6e534306b4f5f832986cf37223da4..fe97aa0b33b3468756806340ed13980479d77a56 100644 (file)
--- 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 6bcf31e4704a387ebe4a05bac472340c64bae387..b5ee39df3e8692a760e7b5b91b22d6f93345eb74 100644 (file)
--- 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 caad3e8ea7736bb82f2d73d37222630ced56e5d0..1fff1f1a6c51d41fbbaf9cd0a579c1aa06cd2dc7 100644 (file)
--- 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 7392762e341ac69ff14c76c0ff9aac4825fcc9e9..534bf6656ec4e21a52b62ea6f01c32915a51152c 100644 (file)
--- 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 f55ee67f167e1462c4bcead1db8da3f60d21b959..f736a60d2f0b0bd4ec9b264ebe5d98792b403850 100644 (file)
--- 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 d68ca1c9522bcc0d285b853858ebb84a463b5d3b..15830062762ca41c5c795bc95c9679afbefccb44 100644 (file)
--- 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 e347f186e8d9f0652f8cba82290aec431d5620d7..07f543bdaea50297a0bc70c7a044fbb8f5fadcf7 100644 (file)
--- 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 961773ed736ff1078cff5d4e00ca96c4f8a7b9c9..a1a943b5134eaf67309d4a8731acbeb22f02b956 100644 (file)
--- 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 a5f08b7b1b559bb719a68703d09e6b0f31bfdcee..a9f4b8af74155a857876aa75d34a1186885168ba 100644 (file)
--- 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.");