detect: cleanup

Remove unused alstate and app layer flags arguments from
DetectEngineInspectPacketPayload()
pull/940/head
Victor Julien 12 years ago
parent 6e0112d737
commit 5e1bc99e5b

@ -46,16 +46,13 @@
* \param det_ctx Detection engine thread context * \param det_ctx Detection engine thread context
* \param s Signature to inspect * \param s Signature to inspect
* \param f flow (for pcre flowvar storage) * \param f flow (for pcre flowvar storage)
* \param flags app layer flags
* \param state App layer state
* \param p Packet * \param p Packet
* *
* \retval 0 no match * \retval 0 no match
* \retval 1 match * \retval 1 match
*/ */
int DetectEngineInspectPacketPayload(DetectEngineCtx *de_ctx, int DetectEngineInspectPacketPayload(DetectEngineCtx *de_ctx,
DetectEngineThreadCtx *det_ctx, Signature *s, Flow *f, uint8_t flags, DetectEngineThreadCtx *det_ctx, Signature *s, Flow *f, Packet *p)
void *alstate, Packet *p)
{ {
SCEnter(); SCEnter();
int r = 0; int r = 0;

@ -25,8 +25,7 @@
#define __DETECT_ENGINE_PAYLOAD_H__ #define __DETECT_ENGINE_PAYLOAD_H__
int DetectEngineInspectPacketPayload(DetectEngineCtx *, int DetectEngineInspectPacketPayload(DetectEngineCtx *,
DetectEngineThreadCtx *, Signature *, Flow *, uint8_t, DetectEngineThreadCtx *, Signature *, Flow *, Packet *);
void *, Packet *);
int DetectEngineInspectStreamPayload(DetectEngineCtx *, int DetectEngineInspectStreamPayload(DetectEngineCtx *,
DetectEngineThreadCtx *, Signature *, Flow *, DetectEngineThreadCtx *, Signature *, Flow *,
uint8_t *, uint32_t); uint8_t *, uint32_t);

@ -1444,11 +1444,11 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
s->mpm_pattern_id_mod_8)) { s->mpm_pattern_id_mod_8)) {
goto next; 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; goto next;
} }
} else { } 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; goto next;
} }
} }
@ -1460,12 +1460,12 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
s->mpm_pattern_id_mod_8)) { s->mpm_pattern_id_mod_8)) {
goto next; 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; goto next;
} }
} else { } 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; goto next;
} }
} }

Loading…
Cancel
Save