Remove the unused flow flags - FLOW_TS_PM_PP_ALPROTO_DETECT_DONE and

FLOW_TC_PM_PP_ALPROTO_DETECT_DONE.

diff --git a/src/flow.h b/src/flow.h
index ddde8584620176871d6c8b987fce0df29c9869a6..c75de3c44332e0db3eb09343c3e8be5108f17b0c 100644 (file)
--- 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 0792d596809eedf0c8f5209f300351d3e3154e7f..3ea9e91de726ab4ed195df6244c3e1bc2f33cf50 100644 (file)
--- 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;