Merge pull request #282 in SNORT/snort3 from detection_option_tree_compare_fix to...

Squashed commit of the following:

commit 1199316fa35ca54da8c3d363f05c032cc28e9fda
Author: Victor Roemer <viroemer@cisco.com>
Date:   Fri Feb 19 16:20:18 2016 -0500

    Compare ips options and not the pointers.

diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index 63a59171ac29f9aee662e4db1c869ac0d04fbe1e..a70a10c3502e02f2c395f6aba7dfa972260f8636 100644 (file)
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -102,7 +102,7 @@ int detection_option_key_compare_func(const void* k1, const void* k2, size_t)
         IpsOption* opt1 = (IpsOption*)key1->option_data;
         IpsOption* opt2 = (IpsOption*)key2->option_data;
 
-        if ( opt1 == opt2 )
+        if ( *opt1 == *opt2 )
             return DETECTION_OPTION_EQUAL;
     }
     return DETECTION_OPTION_NOT_EQUAL;