From: Victor Julien Date: Thu, 10 Feb 2022 08:04:23 +0000 (+0100) Subject: detect/iponly: cleanups X-Git-Tag: suricata-5.0.9~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20c9e738dff7fa17de4ed11aacec7a653b2ea86;p=thirdparty%2Fsuricata.git detect/iponly: cleanups (cherry picked from commit 6381b1a643bb9cc4ea8860def42b633a70c35e3e) --- diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c index c82ca7c64c..96921fd47e 100644 --- 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 155459ddd8..7f4f70bcf0 100644 --- 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 *,