]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
ippair: fix global declarations
authorVictor Julien <victor@inliniac.net>
Wed, 29 Jan 2020 09:56:54 +0000 (10:56 +0100)
committerVictor Julien <victor@inliniac.net>
Tue, 11 Feb 2020 19:38:50 +0000 (20:38 +0100)
src/ippair.c
src/ippair.h

index 1d7c899082daf2fe34ed4a553a80d3ca0a3ad3f5..07d4e4efb98b04252d70d4cccb3da8516c7b5456 100644 (file)
 
 static IPPair *IPPairGetUsedIPPair(void);
 
+/** ippair hash table */
+IPPairHashRow *ippair_hash;
 /** queue with spare ippairs */
 static IPPairQueue ippair_spare_q;
+IPPairConfig ippair_config;
+SC_ATOMIC_DECLARE(uint64_t,ippair_memuse);
+SC_ATOMIC_DECLARE(uint32_t,ippair_counter);
+SC_ATOMIC_DECLARE(uint32_t,ippair_prune_idx);
 
 /** size of the ippair object. Maybe updated in IPPairInitConfig to include
  *  the storage APIs additions. */
index e5142856ed1c42584bc07ffdff0673002f0bb573..d89de6752c43d35f00b62d4e665b324c0ddb3b8e 100644 (file)
@@ -84,7 +84,7 @@ typedef struct IPPairHashRow_ {
 } __attribute__((aligned(CLS))) IPPairHashRow;
 
 /** ippair hash table */
-IPPairHashRow *ippair_hash;
+extern IPPairHashRow *ippair_hash;
 
 #define IPPAIR_VERBOSE    0
 #define IPPAIR_QUIET      1
@@ -125,10 +125,10 @@ typedef struct IPPairConfig_ {
         }                                             \
     } while (0)
 
-IPPairConfig ippair_config;
-SC_ATOMIC_DECLARE(uint64_t,ippair_memuse);
-SC_ATOMIC_DECLARE(uint32_t,ippair_counter);
-SC_ATOMIC_DECLARE(uint32_t,ippair_prune_idx);
+extern IPPairConfig ippair_config;
+SC_ATOMIC_EXTERN(uint64_t,ippair_memuse);
+SC_ATOMIC_EXTERN(uint32_t,ippair_counter);
+SC_ATOMIC_EXTERN(uint32_t,ippair_prune_idx);
 
 void IPPairInitConfig(char quiet);
 void IPPairShutdown(void);