detect: cleanup

Remove unused alstate and app layer flags arguments from
DetectEngineInspectPacketPayload()

diff --git a/src/detect-engine-payload.c b/src/detect-engine-payload.c
index 12c2196b582a5f8dd9fcdda348a951914d35139e..b8168bf9ab4bd97472d2bc82ff20c996f1f5f927 100644 (file)
--- a/src/detect-engine-payload.c
+++ b/src/detect-engine-payload.c
@@ -46,16 +46,13 @@
  *  \param det_ctx Detection engine thread context
  *  \param s Signature to inspect
  *  \param f flow (for pcre flowvar storage)
- *  \param flags app layer flags
- *  \param state App layer state
  *  \param p Packet
  *
  *  \retval 0 no match
  *  \retval 1 match
  */
 int DetectEngineInspectPacketPayload(DetectEngineCtx *de_ctx,
-        DetectEngineThreadCtx *det_ctx, Signature *s, Flow *f, uint8_t flags,
-        void *alstate, Packet *p)
+        DetectEngineThreadCtx *det_ctx, Signature *s, Flow *f, Packet *p)
 {
     SCEnter();
     int r = 0;

diff --git a/src/detect-engine-payload.h b/src/detect-engine-payload.h
index 3db1c94f03674f113eee9f1a97558e9695a99432..d6220b18a598423a7db2b1a5907712fd8b3cdcdb 100644 (file)
--- a/src/detect-engine-payload.h
+++ b/src/detect-engine-payload.h
@@ -25,8 +25,7 @@
 #define __DETECT_ENGINE_PAYLOAD_H__
 
 int DetectEngineInspectPacketPayload(DetectEngineCtx *,
-        DetectEngineThreadCtx *, Signature *, Flow *, uint8_t,
-        void *, Packet *);
+        DetectEngineThreadCtx *, Signature *, Flow *, Packet *);
 int DetectEngineInspectStreamPayload(DetectEngineCtx *,
         DetectEngineThreadCtx *, Signature *, Flow *,
         uint8_t *, uint32_t);

diff --git a/src/detect.c b/src/detect.c
index d5bcab1a46444ce20c276819b189c3d6e9ea7bf4..f569207c5a412b93ad094ada1ae09ba9ec8869b9 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -1444,11 +1444,11 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
                               s->mpm_pattern_id_mod_8)) {
                             goto next;
                         }
-                        if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, flags, alstate, p) != 1) {
+                        if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) {
                             goto next;
                         }
                     } else {
-                        if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, flags, alstate, p) != 1) {
+                        if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) {
                             goto next;
                         }
                     }
@@ -1460,12 +1460,12 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
                           s->mpm_pattern_id_mod_8)) {
                         goto next;
                     }
-                    if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, flags, alstate, p) != 1) {
+                    if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1) {
                         goto next;
                     }
 
                 } else {
-                    if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, flags, alstate, p) != 1)
+                    if (DetectEngineInspectPacketPayload(de_ctx, det_ctx, s, pflow, p) != 1)
                         goto next;
                 }
             }