]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #92 in SNORT/snort3 from crc/modbus2 to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 22 Oct 2015 00:04:32 +0000 (20:04 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 22 Oct 2015 00:04:32 +0000 (20:04 -0400)
commit52a9ccfa44b4dc1a180bc1decb18ae86b2444c20
tree18bd5da116fdd5c79cfa9b52b4528f9c3125ef3a
parent09ee34cb269cf08336106ef1c0a559963dddcff5
Merge pull request #92 in SNORT/snort3 from crc/modbus2 to master

Squashed commit of the following:

commit d39dd81b300723d990c42b301e73aaa0e8db8386
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Oct 21 15:08:25 2015 -0400

    review updates

commit 97306ddbf13f8dccf692613b0f6835e68841e8d0
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Oct 20 23:22:06 2015 -0400

    initial modbus port
20 files changed:
configure.ac
doc/style.txt
src/Makefile.am
src/service_inspectors/CMakeLists.txt
src/service_inspectors/Makefile.am
src/service_inspectors/modbus/CMakeLists.txt [new file with mode: 0644]
src/service_inspectors/modbus/Makefile.am [new file with mode: 0644]
src/service_inspectors/modbus/dev_notes.txt [new file with mode: 0644]
src/service_inspectors/modbus/ips_modbus_data.cc [new file with mode: 0644]
src/service_inspectors/modbus/ips_modbus_func.cc [new file with mode: 0644]
src/service_inspectors/modbus/ips_modbus_unit.cc [new file with mode: 0644]
src/service_inspectors/modbus/modbus.cc [new file with mode: 0644]
src/service_inspectors/modbus/modbus.h [new file with mode: 0644]
src/service_inspectors/modbus/modbus_decode.cc [new file with mode: 0644]
src/service_inspectors/modbus/modbus_decode.h [new file with mode: 0644]
src/service_inspectors/modbus/modbus_module.cc [new file with mode: 0644]
src/service_inspectors/modbus/modbus_module.h [new file with mode: 0644]
src/service_inspectors/modbus/modbus_paf.cc [new file with mode: 0644]
src/service_inspectors/modbus/modbus_paf.h [new file with mode: 0644]
src/service_inspectors/service_inspectors.cc