]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Export IsRuleReloadSet and use it.
authorEric Leblond <eric@regit.org>
Tue, 30 Jul 2013 13:21:55 +0000 (15:21 +0200)
committerEric Leblond <eric@regit.org>
Tue, 30 Jul 2013 13:22:33 +0000 (15:22 +0200)
src/detect.c
src/suricata.c
src/suricata.h

index 0a2515b4f152e4b5adc8dffaa0e6c30815b05b46..cf5eba58366f03e41167ef77c31d273d54c44a0d 100644 (file)
@@ -2612,7 +2612,9 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx) {
 
 #ifdef HAVE_LUAJIT
     /* run this before the mpm states are initialized */
-    if (DetectLuajitSetupStatesPool(de_ctx->detect_luajit_instances, rule_reload) != 0) {
+    if (DetectLuajitSetupStatesPool(de_ctx->detect_luajit_instances,
+                                    IsRuleReloadSet(TRUE))
+            != 0) {
         if (de_ctx->failure_fatal)
             return -1;
     }
index f1249d6f54d71a52d58e55c008531db032c9952e..68053c9915f76c5d3916d2d9ee7a48a705b62baa 100644 (file)
@@ -800,7 +800,7 @@ TmEcode LoadYamlConfig(char *conf_filename) {
     SCReturnInt(TM_ECODE_OK);
 }
 
-static int IsRuleReloadSet(int quiet)
+int IsRuleReloadSet(int quiet)
 {
     int rule_reload;
 
index 60b0d1e4d4b183c0d310539cfac4cd030a1e3bbf..a6da0366c3989a6dadb46d1fa191c3c593fa7329 100644 (file)
@@ -152,6 +152,7 @@ void SignalHandlerSigusr2Idle(int sig);
 
 int RunmodeIsUnittests(void);
 int RunmodeGetCurrent(void);
+int IsRuleReloadSet(int quiet);
 
 extern int run_mode;