From: Victor Julien <victor@inliniac.net>
Date: Mon, 9 Oct 2017 07:06:47 +0000 (+0200)
Subject: detect: constify rule group lookup
X-Git-Tag: suricata-4.1.0-beta1~540
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e86c3f0a40a75ee934c4213436f0694af13ac319;p=thirdparty%2Fsuricata.git

detect: constify rule group lookup
---

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 0b631a6ffb..a845a0c514 100644
--- 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 0e7a6437a2..50011d2e70 100644
--- 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 387caccbfe..f86b5876a2 100644
--- 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);