From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Tue, 11 Nov 2014 21:24:44 +0000 (-0500)
Subject: fixed white-/black-list enforcement
X-Git-Tag: 3.0.0-233~1237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0976c53fc9d03f7d98312edfbd135227ca0159;p=thirdparty%2Fsnort3.git

fixed white-/black-list enforcement
---

diff --git a/ChangeLog b/ChangeLog
index a7942cefd..c63ee3a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
 -- snort2lua updates from josh
 -- suppress repeated 129:20 on same session
 -- fixed legacy HI scanner events
+-- fixed whitelist / blacklist enforcement
 
 127
 -- REG_TEST out logging tcp options for rebuilt packets to match snort bug
diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index c8b453b61..ca61dabdb 100644
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -370,11 +370,14 @@ unsigned FlowControl::process(FlowCache* cache, Packet* p)
         break;
 
     case Flow::ALLOW:
+        p->ptrs.decode_flags |= DECODE_PKT_TRUST;
         stream.stop_inspection(flow, p, SSN_DIR_BOTH, -1, 0);
         break;
 
     case Flow::BLOCK:
+        // FIXIT-M should not repeatedly clear session
         stream.drop_packet(p);
+        Active_DropSession();
         break;
     }