From 715ff60087af4a09d36ac5e1656d9f25f61eff25 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 17 Oct 2016 17:30:23 +0200 Subject: [PATCH] detect: remove unused SIG_FLAG_INIT_PAYLOAD init_flag --- src/detect.c | 4 ---- src/detect.h | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/detect.c b/src/detect.c index d998e8db0d..00b5dfece4 100644 --- a/src/detect.c +++ b/src/detect.c @@ -3400,7 +3400,6 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx) /* see if any sig is inspecting the packet payload */ } else if (SignatureIsInspectingPayload(de_ctx, tmp_s) == 1) { - tmp_s->init_flags |= SIG_FLAG_INIT_PAYLOAD; cnt_payload++; SCLogDebug("Signature %"PRIu32" is considered \"Payload inspecting\"", tmp_s->id); @@ -8384,9 +8383,6 @@ int SigTest40NoPayloadInspection02(void) SigGroupBuild(de_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); - if (!(de_ctx->sig_list->init_flags & SIG_FLAG_INIT_PAYLOAD)) - result = 0; - SigMatchSignatures(&th_v, de_ctx, det_ctx, p); if (PacketAlertCheck(p, 1)) diff --git a/src/detect.h b/src/detect.h index 8ff86974cd..fb05ac7a9b 100644 --- a/src/detect.h +++ b/src/detect.h @@ -297,8 +297,7 @@ typedef struct DetectPort_ { #define SIG_FLAG_INIT_PACKET (1<<1) /**< signature has matches against a packet (as opposed to app layer) */ #define SIG_FLAG_INIT_FLOW (1<<2) /**< signature has a flow setting */ #define SIG_FLAG_INIT_BIDIREC (1<<3) /**< signature has bidirectional operator */ -#define SIG_FLAG_INIT_PAYLOAD (1<<4) /**< signature is inspecting the packet payload */ -#define SIG_FLAG_INIT_FIRST_IPPROTO_SEEN (1 << 5) /** < signature has seen the first ip_proto keyword */ +#define SIG_FLAG_INIT_FIRST_IPPROTO_SEEN (1 << 4) /** < signature has seen the first ip_proto keyword */ /* signature mask flags */ #define SIG_MASK_REQUIRE_PAYLOAD (1<<0)