Merge pull request #1526 in SNORT/snort3 from ~SHASLAD/snort3:fix_endless_floodig...

Squashed commit of the following:

commit c3e00d5732bb8c5a12bb24e1130fdfcf22dbed1a
Author: shaslad <shaslad@cisco.com>
Date:   Sat Feb 23 00:09:30 2019 -0500

    flow_control: remove unused session flag

diff --git a/src/flow/flow.h b/src/flow/flow.h
index f3c6d8fc9d86ef5dc89da6b04c4920aa8463aeac..bd931507a8827c9973af4b9cf478f214320ba3fe 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -59,7 +59,6 @@
 
 #define SSNFLAG_DROP_CLIENT         0x00010000
 #define SSNFLAG_DROP_SERVER         0x00020000
-#define SSNFLAG_FORCE_BLOCK         0x00040000
 
 #define SSNFLAG_STREAM_ORDER_BAD    0x00100000
 #define SSNFLAG_CLIENT_SWAP         0x00200000

diff --git a/src/stream/stream.cc b/src/stream/stream.cc
index 29463f10b1d0b9ede58d97591521766c692cb534..b76ac0fe2bd4675f367216f367bfb1fee95deb5d 100644 (file)
--- a/src/stream/stream.cc
+++ b/src/stream/stream.cc
@@ -295,18 +295,10 @@ void Stream::drop_traffic(const Packet* p, char dir)
         return;
 
     if ((dir & SSN_DIR_FROM_CLIENT) && !(flow->ssn_state.session_flags & SSNFLAG_DROP_CLIENT))
-    {
         flow->ssn_state.session_flags |= SSNFLAG_DROP_CLIENT;
-        if ( p->active->packet_force_dropped() )
-            flow->ssn_state.session_flags |= SSNFLAG_FORCE_BLOCK;
-    }
 
     if ((dir & SSN_DIR_FROM_SERVER) && !(flow->ssn_state.session_flags & SSNFLAG_DROP_SERVER))
-    {
         flow->ssn_state.session_flags |= SSNFLAG_DROP_SERVER;
-        if ( p->active->packet_force_dropped() )
-            flow->ssn_state.session_flags |= SSNFLAG_FORCE_BLOCK;
-    }
 }
 
 void Stream::block_flow(const Packet* p)