detect: rename SigAddressPrepare fns to SigPrepare

There is nothing Address specific going on in the preparations.
Stage 1: Preprocessing happens. Sigs classified as IP Only, Masks
applied, content specific limits applied, etc and sig array built.
Stage 2: Sigs grouped by IPOnly, ports and protocols.
Stage 3: Decoder Events SGH built.
Stage 4: File flags set, sig grouping done per prefilter, etc.

diff --git a/src/detect-content.c b/src/detect-content.c
index c7a240d7e01da78e5aec036ca3de9d8f40f66594..ebe28a1b04fab2dc92a4ce7be6e979be121c261c 100644 (file)
--- a/src/detect-content.c
+++ b/src/detect-content.c
@@ -811,7 +811,7 @@ static bool TestLastContent(const Signature *s, uint16_t o, uint16_t d)
         snprintf(rule, sizeof(rule), "alert tcp any any -> any any (%s sid:1; rev:1;)", (sig));    \
         Signature *s = DetectEngineAppendSig(de_ctx, rule);                                        \
         FAIL_IF_NULL(s);                                                                           \
-        SigAddressPrepareStage1(de_ctx);                                                           \
+        SigPrepareStage1(de_ctx);                                                                  \
         bool res = TestLastContent(s, (o), (d));                                                   \
         FAIL_IF(res == false);                                                                     \
         DetectEngineCtxFree(de_ctx);                                                               \

diff --git a/src/detect-engine-build.c b/src/detect-engine-build.c
index 33b8ca206b22e0ed47c837199b28de8198b1d7a8..be1eb2c53f09be56cc6df99d7b6af0c4e9572f74 100644 (file)
--- a/src/detect-engine-build.c
+++ b/src/detect-engine-build.c
@@ -1377,7 +1377,7 @@ void SignatureSetType(DetectEngineCtx *de_ctx, Signature *s)
  * \retval  0 on success
  * \retval -1 on failure
  */
-int SigAddressPrepareStage1(DetectEngineCtx *de_ctx)
+int SigPrepareStage1(DetectEngineCtx *de_ctx)
 {
     uint32_t cnt_iponly = 0;
     uint32_t cnt_payload = 0;
@@ -1720,7 +1720,7 @@ static void DetectEngineAddDecoderEventSig(DetectEngineCtx *de_ctx, Signature *s
  * \retval  0 On success
  * \retval -1 On failure
  */
-int SigAddressPrepareStage2(DetectEngineCtx *de_ctx)
+int SigPrepareStage2(DetectEngineCtx *de_ctx)
 {
     SCLogDebug("building signature grouping structure, stage 2: "
             "building source address lists...");
@@ -1760,7 +1760,7 @@ static void DetectEngineBuildDecoderEventSgh(DetectEngineCtx *de_ctx)
     SigGroupHeadBuildMatchArray(de_ctx, de_ctx->decoder_event_sgh, max_idx);
 }
 
-int SigAddressPrepareStage3(DetectEngineCtx *de_ctx)
+int SigPrepareStage3(DetectEngineCtx *de_ctx)
 {
     /* prepare the decoder event sgh */
     DetectEngineBuildDecoderEventSgh(de_ctx);
@@ -1841,7 +1841,7 @@ static void DbgPrintSigs2(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
 #endif
 
 /** \brief finalize preparing sgh's */
-int SigAddressPrepareStage4(DetectEngineCtx *de_ctx)
+int SigPrepareStage4(DetectEngineCtx *de_ctx)
 {
     SCEnter();
 
@@ -2002,18 +2002,18 @@ int SigGroupBuild(DetectEngineCtx *de_ctx)
 
     SigInitStandardMpmFactoryContexts(de_ctx);
 
-    if (SigAddressPrepareStage1(de_ctx) != 0) {
+    if (SigPrepareStage1(de_ctx) != 0) {
         FatalError("initializing the detection engine failed");
     }
 
-    if (SigAddressPrepareStage2(de_ctx) != 0) {
+    if (SigPrepareStage2(de_ctx) != 0) {
         FatalError("initializing the detection engine failed");
     }
 
-    if (SigAddressPrepareStage3(de_ctx) != 0) {
+    if (SigPrepareStage3(de_ctx) != 0) {
         FatalError("initializing the detection engine failed");
     }
-    if (SigAddressPrepareStage4(de_ctx) != 0) {
+    if (SigPrepareStage4(de_ctx) != 0) {
         FatalError("initializing the detection engine failed");
     }
 

diff --git a/src/detect-engine-build.h b/src/detect-engine-build.h
index 2c9c487928562525d7ca754821758b12a40890e2..513845477ec6d06362da29383ba3b700acfef940 100644 (file)
--- a/src/detect-engine-build.h
+++ b/src/detect-engine-build.h
@@ -29,10 +29,10 @@ int SignatureIsFileSha256Inspecting(const Signature *s);
 int SignatureIsFilesizeInspecting(const Signature *);
 void SignatureSetType(DetectEngineCtx *de_ctx, Signature *s);
 
-int SigAddressPrepareStage1(DetectEngineCtx *de_ctx);
-int SigAddressPrepareStage2(DetectEngineCtx *de_ctx);
-int SigAddressPrepareStage3(DetectEngineCtx *de_ctx);
-int SigAddressPrepareStage4(DetectEngineCtx *de_ctx);
+int SigPrepareStage1(DetectEngineCtx *de_ctx);
+int SigPrepareStage2(DetectEngineCtx *de_ctx);
+int SigPrepareStage3(DetectEngineCtx *de_ctx);
+int SigPrepareStage4(DetectEngineCtx *de_ctx);
 int SigAddressCleanupStage1(DetectEngineCtx *de_ctx);
 
 void SigCleanSignatures(DetectEngineCtx *);

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index b063fda8a614e8f10225dd367f2806183acbbdd0..dfb3c10895e8b5e62bcaee705e8948f510a24e36 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -766,7 +766,7 @@ int SigGroupHeadContainsSigId(DetectEngineCtx *de_ctx, SigGroupHead *sgh,
 
 #ifdef UNITTESTS
 
-int SigAddressPrepareStage1(DetectEngineCtx *);
+int SigPrepareStage1(DetectEngineCtx *);
 
 /**
  * \test Check if a SigGroupHead hash table is properly allocated and
@@ -823,7 +823,7 @@ static int SigGroupHeadTest02(void)
                                       "content:\"test2\"; content:\"test3\"; sid:5;)");
     FAIL_IF_NULL(s);
 
-    SigAddressPrepareStage1(de_ctx);
+    SigPrepareStage1(de_ctx);
 
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list);
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list->next->next);
@@ -883,7 +883,7 @@ static int SigGroupHeadTest03(void)
                                       "content:\"test2\"; content:\"test3\"; sid:5;)");
     FAIL_IF_NULL(s);
 
-    SigAddressPrepareStage1(de_ctx);
+    SigPrepareStage1(de_ctx);
 
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list);
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list->next->next);
@@ -951,7 +951,7 @@ static int SigGroupHeadTest04(void)
                                       "content:\"test2\"; content:\"test3\"; sid:5;)");
     FAIL_IF_NULL(s);
 
-    SigAddressPrepareStage1(de_ctx);
+    SigPrepareStage1(de_ctx);
 
     SigGroupHeadAppendSig(de_ctx, &src_sh, de_ctx->sig_list);
     SigGroupHeadAppendSig(de_ctx, &src_sh, de_ctx->sig_list->next->next);
@@ -1021,7 +1021,7 @@ static int SigGroupHeadTest05(void)
                                       "content:\"test2\"; content:\"test3\"; sid:5;)");
     FAIL_IF_NULL(s);
 
-    SigAddressPrepareStage1(de_ctx);
+    SigPrepareStage1(de_ctx);
 
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list);
     SigGroupHeadAppendSig(de_ctx, &sh, de_ctx->sig_list->next->next);