main.cc (snort3-3.1.29.0) | : | main.cc (snort3-3.1.30.0) | ||
---|---|---|---|---|
skipping to change at line 64 | skipping to change at line 64 | |||
#include "trace/trace_api.h" | #include "trace/trace_api.h" | |||
#include "trace/trace_config.h" | #include "trace/trace_config.h" | |||
#include "trace/trace_logger.h" | #include "trace/trace_logger.h" | |||
#include "utils/util.h" | #include "utils/util.h" | |||
#include "utils/safec.h" | #include "utils/safec.h" | |||
#if defined(UNIT_TEST) || defined(BENCHMARK_TEST) | #if defined(UNIT_TEST) || defined(BENCHMARK_TEST) | |||
#include "catch/unit_test.h" | #include "catch/unit_test.h" | |||
#endif | #endif | |||
#ifdef PIGLET | ||||
#include "piglet/piglet.h" | ||||
#endif | ||||
#ifdef SHELL | #ifdef SHELL | |||
#include "control/control_mgmt.h" | #include "control/control_mgmt.h" | |||
#include "main/ac_shell_cmd.h" | #include "main/ac_shell_cmd.h" | |||
#endif | #endif | |||
//------------------------------------------------------------------------- | //------------------------------------------------------------------------- | |||
using namespace snort; | using namespace snort; | |||
static bool exit_requested = false; | static bool exit_requested = false; | |||
skipping to change at line 875 | skipping to change at line 871 | |||
if ( !sc->read_mode() && !SFDAQ::get_input_spec(sc->daq_config, 0) ) | if ( !sc->read_mode() && !SFDAQ::get_input_spec(sc->daq_config, 0) ) | |||
return true; | return true; | |||
} | } | |||
return false; | return false; | |||
} | } | |||
static bool set_mode() | static bool set_mode() | |||
{ | { | |||
#ifdef PIGLET | ||||
if ( Piglet::piglet_mode() ) | ||||
{ | ||||
main_exit_code = Piglet::main(); | ||||
return false; | ||||
} | ||||
#endif | ||||
#if defined(UNIT_TEST) || defined(BENCHMARK_TEST) | #if defined(UNIT_TEST) || defined(BENCHMARK_TEST) | |||
// FIXIT-M X we should move this out of set_mode and not do Snort bring up/t eardown at all | // FIXIT-M X we should move this out of set_mode and not do Snort bring up/t eardown at all | |||
if ( catch_enabled() ) | if ( catch_enabled() ) | |||
{ | { | |||
main_exit_code = catch_test(); | main_exit_code = catch_test(); | |||
return false; | return false; | |||
} | } | |||
#endif | #endif | |||
unsigned warnings = get_parse_warnings(); | unsigned warnings = get_parse_warnings(); | |||
End of changes. 2 change blocks. | ||||
11 lines changed or deleted | 0 lines changed or added |