Merge pull request #754 in SNORT/snort3 from crc_s2l to master

Squashed commit of the following:

commit e5ffd64ddf366e1243ad75892fd3e8b3f2bd684b
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Dec 15 15:39:39 2016 -0500

    fix modbus_data handling to not skip options
    thanks to FabianMalte.Kopp@b-tu.de for reporting the issue

diff --git a/tools/snort2lua/conversion_state.h b/tools/snort2lua/conversion_state.h
index 69308b8358ad4a824051ac08994c65cb2ea2b43f..b903839ba0a26821b0c7196c011178ab7a8c8b2e 100644 (file)
--- a/tools/snort2lua/conversion_state.h
+++ b/tools/snort2lua/conversion_state.h
@@ -254,10 +254,8 @@ protected:
             std::size_t semi_colon_pos = keyword.find(';');
             if (semi_colon_pos != std::string::npos)
             {
-                // found an option without a colon, so set stream
-                // to semi-colon
-                std::streamoff off = 1 + (std::streamoff)(pos) +
-                    (std::streamoff)(semi_colon_pos);
+                // found an option without a colon, so set stream to semi-colon
+                std::streamoff off = 1 + (std::streamoff)(pos) + (std::streamoff)(semi_colon_pos);
                 stream.seekg(off);
                 keyword = keyword.substr(0, semi_colon_pos);
             }

diff --git a/tools/snort2lua/rule_states/rule_unchanged.cc b/tools/snort2lua/rule_states/rule_unchanged.cc
index d4c1749d27eb1d216b3417e2e84eeae4178f7792..c8b8d5be55560657d149a8f0fb44a00a6aa752d1 100644 (file)
--- a/tools/snort2lua/rule_states/rule_unchanged.cc
+++ b/tools/snort2lua/rule_states/rule_unchanged.cc
@@ -530,7 +530,7 @@ static const std::string modbus_data = "modbus_data";
 static const ConvertMap rule_modbus_data =
 {
     modbus_data,
-    unchanged_rule_ctor<& modbus_data>,
+    unchanged_rule_ctor<& modbus_data, false>,
 };
 
 const ConvertMap* modbus_data_map = &rule_modbus_data;