From: Andreas Herz <andi@geekosphere.org>
Date: Sat, 23 Jul 2016 19:59:12 +0000 (+0200)
Subject: rule-reload: remember pending USR2 signals
X-Git-Tag: suricata-3.2beta1~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d54d8c590971a9b126d0baf2343f508b1ec09e6;p=thirdparty%2Fsuricata.git

rule-reload: remember pending USR2 signals

We did ignore additional USR2 signals while a rule-reload was running.
This changes the counter to be incremented with every additional USR2
signal so we don't ignore them anymore but it's still limited to prevent
huge overload or even overflow.
---

diff --git a/src/suricata.c b/src/suricata.c
index 2bbdb3bffb..f23820551a 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -265,7 +265,11 @@ static void SignalHandlerSigterm(/*@unused@*/ int sig)
  */
 static void SignalHandlerSigusr2(int sig)
 {
-    sigusr2_count = 1;
+    if (sigusr2_count < 16) {
+        sigusr2_count++;
+    } else {
+        SCLogWarning(SC_ERR_LIVE_RULE_SWAP, "Too many USR2 signals pending, ignoring new ones!");
+    }
 }
 
 /**