From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 14 Sep 2016 00:01:41 +0000 (-0400)
Subject: Merge pull request #621 in SNORT/snort3 from det_filt to master
X-Git-Tag: 3.0.0-233~263^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51b4698ae6ae99b109f36389b9806c240fc17b72;p=thirdparty%2Fsnort3.git

Merge pull request #621 in SNORT/snort3 from det_filt to master

Squashed commit of the following:

commit 0aaf1bda7810d19035d6ada0c5b8be54ded81903
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Sep 13 16:20:19 2016 -0400

    fix inverted detection_filter logic
---

diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index 33ce1c633..dde3863b6 100644
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -454,7 +454,7 @@ int detection_option_node_evaluate(
                 bool f_result = true;
 
                 if ( otn->detection_filter )
-                    f_result = detection_filter_test(otn->detection_filter,
+                    f_result = !detection_filter_test(otn->detection_filter,
                         p->ptrs.ip_api.get_src(), p->ptrs.ip_api.get_dst(),
                         p->pkth->ts.tv_sec);