]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1031 in SNORT/snort3 from binder_zones to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 6 Oct 2017 21:00:39 +0000 (17:00 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 6 Oct 2017 21:00:39 +0000 (17:00 -0400)
commit5186baf38eb8ee49c7769e7621bf5f7cff805c6f
treec8c3e832d77ac67c4284a996637176e5898d9869
parentc150e9d298f2abe81669f7a75705f8c72b1af475
Merge pull request #1031 in SNORT/snort3 from binder_zones to master

Squashed commit of the following:

commit 08bd025019ff9a61a035fc9f8faa99d48bc6f132
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Oct 6 10:46:02 2017 -0400

    fixed build issues on OSX

commit 5bb5412170ab5c01714a71fd01b762883899e71d
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Oct 3 15:47:59 2017 -0400

    snort2lua: removed port dce proxy bindings to fix http_inspect conflicts

commit 54a5be5daf20ce10fc404b92d897b3a4c700dd1d
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Sep 29 12:12:55 2017 -0400

    snort2lua: added nap.rules zone translation

commit c09df9d2a008f0e319f697de41dd86cc14396657
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Oct 5 08:56:05 2017 -0400

    binder: check interface on packet instead of flow

commit b6f365f960d42b97ebf7b396508699e0c2670b09
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 28 15:37:13 2017 -0400

    binder: added zones
src/decompress/file_decomp.h
src/flow/flow.h
src/managers/so_manager.cc
src/network_inspectors/binder/bind_module.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/binder/binding.h
src/service_inspectors/http_inspect/http_stream_splitter_reassemble.cc
tools/snort2lua/helpers/util_binder.cc
tools/snort2lua/helpers/util_binder.h
tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
tools/snort2lua/preprocessor_states/pps_nap_selector.cc