detect/iponly: cleanups

(cherry picked from commit 6381b1a643bb9cc4ea8860def42b633a70c35e3e)

diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index c82ca7c64c2942bebb20b580f8c75b37506560d2..96921fd47ea9b361a854d88d6221b1c25a9aa918 100644 (file)
--- a/src/detect-engine-iponly.c
+++ b/src/detect-engine-iponly.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2020 Open Information Security Foundation
+/* Copyright (C) 2007-2022 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -488,6 +488,17 @@ static void IPOnlyCIDRListPrint(IPOnlyCIDRItem *tmphead)
 }
 #endif
 
+/**
+ * SigNumArray is a bit array representing signatures
+ * it can be used linked to src/dst address to indicate
+ * which signatures apply to this addres
+ * at IP Only we store SigNumArrays at the radix trees
+ */
+typedef struct SigNumArray_ {
+    uint8_t *array; /* bit array of sig nums */
+    uint32_t size;  /* size in bytes of the array */
+} SigNumArray;
+
 /**
  * \brief This function print a SigNumArray, it's used with the
  *        radix tree print function to help debugging

diff --git a/src/detect-engine-iponly.h b/src/detect-engine-iponly.h
index 155459ddd852acc88614d17372051d0279ad39ca..7f4f70bcf080044be7c1ca5708cacb62eb67954e 100644 (file)
--- a/src/detect-engine-iponly.h
+++ b/src/detect-engine-iponly.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
+/* Copyright (C) 2007-2022 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -24,17 +24,6 @@
 #ifndef __DETECT_ENGINE_IPONLY_H__
 #define __DETECT_ENGINE_IPONLY_H__
 
-/**
- * SigNumArray is a bit array representing signatures
- * it can be used linked to src/dst address to indicate
- * which signatures apply to this addres
- * at IP Only we store SigNumArrays at the radix trees
- */
-typedef struct SigNumArray_ {
-    uint8_t *array; /* bit array of sig nums */
-    uint32_t size;  /* size in bytes of the array */
-} SigNumArray;
-
 void IPOnlyCIDRListFree(IPOnlyCIDRItem *tmphead);
 int IPOnlySigParseAddress(const DetectEngineCtx *, Signature *, const char *, char);
 void IPOnlyMatchPacket(ThreadVars *tv, const DetectEngineCtx *,