]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #754 in SNORT/snort3 from crc_s2l to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 15 Dec 2016 22:41:19 +0000 (17:41 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 15 Dec 2016 22:41:19 +0000 (17:41 -0500)
commitdcf27bd27b53031320b71f3450ba98b85ca367b4
tree2e3863f52ae5a0a3cd7584d2a2046da3b69dd97e
parent8f7e3aa1b92c8f816e6f6833e46d95f4e7d048d4
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
tools/snort2lua/conversion_state.h
tools/snort2lua/rule_states/rule_unchanged.cc