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 33ce1c6336f86922d8d2952fb546fe18233a4d0f..dde3863b610314ca06ed999a683fff88155570fb 100644 (file)
--- 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);