detect: constify rule group lookup

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 0b631a6ffbeea38318d236b8580a340c587106a4..a845a0c5144c7c144a4db41e7aef3b42efbabfbf 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -1183,7 +1183,7 @@ static int SigGroupHeadTest10(void)
 
     AddressDebugPrint(&p->dst);
 
-    SigGroupHead *sgh = SigMatchSignaturesGetSgh(de_ctx, det_ctx, p);
+    const SigGroupHead *sgh = SigMatchSignaturesGetSgh(de_ctx, p);
     if (sgh == NULL) {
         goto end;
     }

diff --git a/src/detect.c b/src/detect.c
index 0e7a6437a282f4e454a0d73add7345fb0d9b6ac1..50011d2e704c283784e365b0700076646051e42f 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -584,12 +584,12 @@ int SigMatchSignaturesRunPostMatch(ThreadVars *tv,
  *  \brief Get the SigGroupHead for a packet.
  *
  *  \param de_ctx detection engine context
- *  \param det_ctx thread detection engine content
  *  \param p packet
  *
  *  \retval sgh the SigGroupHead or NULL if non applies to the packet
  */
-SigGroupHead *SigMatchSignaturesGetSgh(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, Packet *p)
+const SigGroupHead *SigMatchSignaturesGetSgh(const DetectEngineCtx *de_ctx,
+        const Packet *p)
 {
     SCEnter();
 
@@ -1043,7 +1043,7 @@ void SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineT
 
         if (!(use_flow_sgh)) {
             PACKET_PROFILING_DETECT_START(p, PROF_DETECT_GETSGH);
-            det_ctx->sgh = SigMatchSignaturesGetSgh(de_ctx, det_ctx, p);
+            det_ctx->sgh = SigMatchSignaturesGetSgh(de_ctx, p);
             PACKET_PROFILING_DETECT_END(p, PROF_DETECT_GETSGH);
         }
 
@@ -1057,7 +1057,7 @@ void SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineT
         PACKET_PROFILING_DETECT_END(p, PROF_DETECT_IPONLY);
 
         PACKET_PROFILING_DETECT_START(p, PROF_DETECT_GETSGH);
-        det_ctx->sgh = SigMatchSignaturesGetSgh(de_ctx, det_ctx, p);
+        det_ctx->sgh = SigMatchSignaturesGetSgh(de_ctx, p);
         PACKET_PROFILING_DETECT_END(p, PROF_DETECT_GETSGH);
     }
 

diff --git a/src/detect.h b/src/detect.h
index 387caccbfed69116a981381397727f8aa789a0e2..f86b5876a2184cece69dd1e5fc971ef822db245f 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -1399,7 +1399,7 @@ void SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx,
                        DetectEngineThreadCtx *det_ctx, Packet *p);
 
 int SignatureIsIPOnly(DetectEngineCtx *de_ctx, const Signature *s);
-SigGroupHead *SigMatchSignaturesGetSgh(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, Packet *p);
+const SigGroupHead *SigMatchSignaturesGetSgh(const DetectEngineCtx *de_ctx, const Packet *p);
 
 Signature *DetectGetTagSignature(void);