From: Victor Julien <victor@inliniac.net>
Date: Sun, 28 Feb 2021 08:21:36 +0000 (+0100)
Subject: detect/state: minor code cleanup
X-Git-Tag: suricata-7.0.0-beta1~1746
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a808474d38afa7555dcc10690d2a184ada6d7990;p=thirdparty%2Fsuricata.git

detect/state: minor code cleanup
---

diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c
index ac32a95b73..6a0e15b145 100644
--- a/src/detect-engine-state.c
+++ b/src/detect-engine-state.c
@@ -255,6 +255,19 @@ void DeStateUpdateInspectTransactionId(Flow *f, const uint8_t flags,
     return;
 }
 
+static inline void ResetTxState(DetectEngineState *s)
+{
+    if (s) {
+        s->dir_state[0].cnt = 0;
+        s->dir_state[0].filestore_cnt = 0;
+        s->dir_state[0].flags = 0;
+
+        s->dir_state[1].cnt = 0;
+        s->dir_state[1].filestore_cnt = 0;
+        s->dir_state[1].flags = 0;
+    }
+}
+
 /** \brief Reset de state for active tx'
  *  To be used on detect engine reload.
  *  \param f write LOCKED flow
@@ -277,17 +290,7 @@ void DetectEngineStateResetTxs(Flow *f)
         void *inspect_tx = AppLayerParserGetTx(f->proto, f->alproto, alstate, inspect_tx_id);
         if (inspect_tx != NULL) {
             DetectEngineState *tx_de_state = AppLayerParserGetTxDetectState(f->proto, f->alproto, inspect_tx);
-            if (tx_de_state == NULL) {
-                continue;
-            }
-
-            tx_de_state->dir_state[0].cnt = 0;
-            tx_de_state->dir_state[0].filestore_cnt = 0;
-            tx_de_state->dir_state[0].flags = 0;
-
-            tx_de_state->dir_state[1].cnt = 0;
-            tx_de_state->dir_state[1].filestore_cnt = 0;
-            tx_de_state->dir_state[1].flags = 0;
+            ResetTxState(tx_de_state);
         }
     }
 }