]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1014 in SNORT/snort3 from policy_split to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 20 Sep 2017 18:05:41 +0000 (14:05 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 20 Sep 2017 18:05:41 +0000 (14:05 -0400)
commit8ce7d5910f740c323c10636f01d339d3955ffad9
treeac4195baedfe1f49ab60f543bef0d73560da23ea
parent1888394ca506750094ecdf8924bbcb86a5ee486e
Merge pull request #1014 in SNORT/snort3 from policy_split to master

Squashed commit of the following:

commit 0770342be4f4da6ec65d0719ba97b39d6f96b464
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Sep 19 11:26:00 2017 -0400

    unified2: implemented ips, network, and inspection policy id logging

commit c2ecc2df0f84a87bc9ed76b7815096013fda8c55
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Sep 18 13:04:16 2017 -0400

    appid pop3, appid imap: fixed missing include

commit c01713fbe13151f5b9d2f7519f916a104eb5e3fd
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 14 13:06:20 2017 -0400

    snort2lua: config policy_id converts to when ips_policy_id

    This is an interim support to generate loadable configs until
    proper ips / network / inspection differentiation is added.

commit 22147f8cd90ec44794aa3089fbc5308d86a20339
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 14 11:35:11 2017 -0400

    Shell: force default policies for shells not from binder

commit b50ea6e9dfff279c80427fd806341d578f32feca
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Aug 30 13:50:19 2017 -0400

    Binder, Flow, PolicyMap, Shell: enabled policy splitting by type
23 files changed:
src/flow/flow.h
src/flow/flow_control.cc
src/loggers/unified2.cc
src/main/modules.cc
src/main/policy.cc
src/main/policy.h
src/main/shell.cc
src/main/snort.cc
src/managers/inspector_manager.cc
src/managers/module_manager.cc
src/network_inspectors/appid/detector_plugins/detector_imap.cc
src/network_inspectors/appid/detector_plugins/detector_pop3.cc
src/network_inspectors/binder/bind_module.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/binder/binding.h
src/parser/parser.cc
src/piglet_plugins/pp_packet_iface.cc
src/protocols/packet.h
src/protocols/packet_manager.cc
src/service_inspectors/dce_rpc/dce_common.cc
tools/snort2lua/config_states/config_binding.cc
tools/snort2lua/helpers/util_binder.cc
tools/snort2lua/helpers/util_binder.h