From 558f5705eb622c86c47c5e03b03cf0213f81b30a Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Sat, 28 Sep 2013 12:20:59 +0530 Subject: [PATCH] Remove the unused flow flags - FLOW_TS_PM_PP_ALPROTO_DETECT_DONE and FLOW_TC_PM_PP_ALPROTO_DETECT_DONE. --- src/flow.h | 4 ---- src/stream-tcp.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/flow.h b/src/flow.h index ddde858462..c75de3c443 100644 --- a/src/flow.h +++ b/src/flow.h @@ -78,14 +78,10 @@ #define FLOW_TS_PM_ALPROTO_DETECT_DONE 0x00020000 /** Probing parser alproto detection done */ #define FLOW_TS_PP_ALPROTO_DETECT_DONE 0x00040000 -/** Both pattern matcher and probing parser alproto detection done */ -#define FLOW_TS_PM_PP_ALPROTO_DETECT_DONE 0x00080000 /** Pattern matcher alproto detection done */ #define FLOW_TC_PM_ALPROTO_DETECT_DONE 0x00100000 /** Probing parser alproto detection done */ #define FLOW_TC_PP_ALPROTO_DETECT_DONE 0x00200000 -/** Both pattern matcher and probing parser alproto detection done */ -#define FLOW_TC_PM_PP_ALPROTO_DETECT_DONE 0x00400000 #define FLOW_TIMEOUT_REASSEMBLY_DONE 0x00800000 /** even if the flow has files, don't store 'm */ #define FLOW_FILE_NO_STORE_TS 0x01000000 diff --git a/src/stream-tcp.c b/src/stream-tcp.c index 0792d59680..3ea9e91de7 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -4287,8 +4287,6 @@ int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt, ~FLOW_TS_PP_ALPROTO_DETECT_DONE & ~FLOW_TC_PM_ALPROTO_DETECT_DONE & ~FLOW_TC_PP_ALPROTO_DETECT_DONE); - p->flow->flags &= ~FLOW_TS_PM_PP_ALPROTO_DETECT_DONE; - p->flow->flags &= ~FLOW_TS_PM_PP_ALPROTO_DETECT_DONE; if (StreamTcpPacketStateNone(tv,p,stt,ssn, &stt->pseudo_queue)) { goto error;