From: Victor Julien Date: Thu, 15 Sep 2022 18:51:54 +0000 (+0200) Subject: detect: clean up detect-engine-state.h X-Git-Tag: suricata-7.0.0-beta1~132 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e2295a96397fc54dce3caab311c46ed34e0c630;p=thirdparty%2Fsuricata.git detect: clean up detect-engine-state.h Remove prototypes that are not about purely the data structures. --- diff --git a/src/detect-engine-state.h b/src/detect-engine-state.h index d6265b3a9b..25cd679a0d 100644 --- a/src/detect-engine-state.h +++ b/src/detect-engine-state.h @@ -108,24 +108,6 @@ DetectEngineState *DetectEngineStateAlloc(void); */ void DetectEngineStateFree(DetectEngineState *state); -void DetectEngineStateResetTxs(Flow *f); - -void DeStateRegisterTests(void); - - -void DetectRunStoreStateTx( - const SigGroupHead *sgh, - Flow *f, void *tx, uint64_t tx_id, - const Signature *s, - uint32_t inspect_flags, uint8_t flow_flags, - const uint16_t file_no_match); - -void DetectRunStoreStateTxFileOnly( - const SigGroupHead *sgh, - Flow *f, void *tx, uint64_t tx_id, - const uint8_t flow_flags, - const uint16_t file_no_match); - #endif /* __DETECT_ENGINE_STATE_H__ */ /** diff --git a/src/detect-engine.h b/src/detect-engine.h index 755d4ac1df..9de9772650 100644 --- a/src/detect-engine.h +++ b/src/detect-engine.h @@ -189,4 +189,15 @@ int DetectBufferGetActiveList(DetectEngineCtx *de_ctx, Signature *s); DetectEngineThreadCtx *DetectEngineThreadCtxInitForReload( ThreadVars *tv, DetectEngineCtx *new_de_ctx, int mt); +void DetectRunStoreStateTx(const SigGroupHead *sgh, Flow *f, void *tx, uint64_t tx_id, + const Signature *s, uint32_t inspect_flags, uint8_t flow_flags, + const uint16_t file_no_match); + +void DetectRunStoreStateTxFileOnly(const SigGroupHead *sgh, Flow *f, void *tx, uint64_t tx_id, + const uint8_t flow_flags, const uint16_t file_no_match); + +void DetectEngineStateResetTxs(Flow *f); + +void DeStateRegisterTests(void); + #endif /* __DETECT_ENGINE_H__ */ diff --git a/src/rust.h b/src/rust.h index dc345412a9..a01e6e602b 100644 --- a/src/rust.h +++ b/src/rust.h @@ -21,7 +21,6 @@ #include "util-lua.h" // hack for include orders cf SCSha256 typedef struct HttpRangeContainerBlock HttpRangeContainerBlock; -#include "detect-engine-state.h" #include "rust-context.h" #include "rust-bindings.h"