From 1dd0a2fed6b4135adbaad159230a85cbd2694c40 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 15 Sep 2022 20:04:34 +0200 Subject: [PATCH] detect: move DetectTransaction to header its used in --- src/detect-engine-prefilter.h | 14 ++++++++++++++ src/detect-engine-state.h | 13 ------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/detect-engine-prefilter.h b/src/detect-engine-prefilter.h index 39ac66fb83..44344468ae 100644 --- a/src/detect-engine-prefilter.h +++ b/src/detect-engine-prefilter.h @@ -26,6 +26,20 @@ #include "detect-engine-state.h" +// TODO +typedef struct DetectTransaction_ { + void *tx_ptr; + const uint64_t tx_id; + struct AppLayerTxData *tx_data_ptr; + DetectEngineStateDirection *de_state; + const uint64_t detect_flags; /* detect flags get/set from/to applayer */ + uint64_t prefilter_flags; /* prefilter flags for direction, to be updated by prefilter code */ + const uint64_t + prefilter_flags_orig; /* prefilter flags for direction, before prefilter has run */ + const int tx_progress; + const int tx_end_state; +} DetectTransaction; + typedef struct PrefilterStore_ { const char *name; void (*FreeFunc)(void *); diff --git a/src/detect-engine-state.h b/src/detect-engine-state.h index 3363e2dd39..3dc86847aa 100644 --- a/src/detect-engine-state.h +++ b/src/detect-engine-state.h @@ -94,19 +94,6 @@ typedef struct DetectEngineState_ { DetectEngineStateDirection dir_state[2]; } DetectEngineState; -// TODO -typedef struct DetectTransaction_ { - void *tx_ptr; - const uint64_t tx_id; - struct AppLayerTxData *tx_data_ptr; - DetectEngineStateDirection *de_state; - const uint64_t detect_flags; /* detect flags get/set from/to applayer */ - uint64_t prefilter_flags; /* prefilter flags for direction, to be updated by prefilter code */ - const uint64_t prefilter_flags_orig; /* prefilter flags for direction, before prefilter has run */ - const int tx_progress; - const int tx_end_state; -} DetectTransaction; - /** * \brief Alloc a DetectEngineState object. *