From 16387f6d953bab308e423bca75f8ad3a3ef847c5 Mon Sep 17 00:00:00 2001 From: "Hui Cao (huica)" Date: Tue, 21 Nov 2017 15:45:25 -0500 Subject: [PATCH] Merge pull request #1073 in SNORT/snort3 from fw_file to master Squashed commit of the following: commit 92fa39b99e9e0726b465fd9656f8f04881a6f7e2 Author: Victor Roemer (viroemer) Date: Mon Nov 20 14:50:17 2017 -0500 target_based: Install header --- src/file_api/file_lib.cc | 9 ++++++++- src/file_api/file_policy.cc | 3 --- src/target_based/CMakeLists.txt | 7 +++++++ src/target_based/Makefile.am | 4 ++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/file_api/file_lib.cc b/src/file_api/file_lib.cc index 146e33f67..46aa29a91 100644 --- a/src/file_api/file_lib.cc +++ b/src/file_api/file_lib.cc @@ -432,7 +432,14 @@ bool FileContext::process(Flow* flow, const uint8_t* file_data, int data_size, config_file_type(false); file_stats->files_processed[get_file_type()][get_file_direction()]++; //Check file type based on file policy - policy->type_lookup(flow, this); + FileVerdict v = policy->type_lookup(flow, this); + if ( v != FILE_VERDICT_UNKNOWN ) + { + FileEnforcer* file_enforcer = FileService::get_file_enforcer(); + if (file_enforcer) + file_enforcer->apply_verdict(flow, this, v, false, policy); + } + log_file_event(flow); } } diff --git a/src/file_api/file_policy.cc b/src/file_api/file_policy.cc index c63beb808..156256684 100644 --- a/src/file_api/file_policy.cc +++ b/src/file_api/file_policy.cc @@ -152,9 +152,6 @@ void FilePolicy::policy_check(Flow*, FileInfo* file) FileVerdict FilePolicy::type_lookup(Flow* flow, FileInfo* file) { FileRule rule = match_file_rule(nullptr, file); - FileEnforcer* file_enforcer = FileService::get_file_enforcer(); - if (file_enforcer) - file_enforcer->apply_verdict(flow, file, rule.use.verdict, false, this); file->config_file_signature(rule.use.signature_enabled); file->config_file_capture(rule.use.capture_enabled); return rule.use.verdict; diff --git a/src/target_based/CMakeLists.txt b/src/target_based/CMakeLists.txt index 40ec02141..0f70878e0 100644 --- a/src/target_based/CMakeLists.txt +++ b/src/target_based/CMakeLists.txt @@ -6,5 +6,12 @@ add_library( target_based STATIC sftarget_hostentry.h sftarget_data.h snort_protocols.cc +) + +set ( TARGET_BASED_INCLUDES snort_protocols.h + ) + +install (FILES ${TARGET_BASED_INCLUDES} + DESTINATION "${INCLUDE_INSTALL_PATH}/target_based" ) diff --git a/src/target_based/Makefile.am b/src/target_based/Makefile.am index 0334d7799..0b14a7fcf 100644 --- a/src/target_based/Makefile.am +++ b/src/target_based/Makefile.am @@ -1,6 +1,10 @@ +x_includedir = $(pkgincludedir)/target_based noinst_LIBRARIES = libtarget_based.a +x_include_HEADERS = \ +snort_protocols.h + libtarget_based_a_SOURCES = \ sftarget_reader.cc \ sftarget_reader.h \ -- 2.47.3