Fix logic operator.

Previous patches on the same subject did not fixed this error as it
was undetected because the code was not compiled on my setup.

diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c
index 04aab9367e2cfaa335a25a7ee5f62dbaf2a405a2..bc9b992e36ef86a65a776d28e4b4b2505bbec123 100644 (file)
--- a/src/source-erf-dag.c
+++ b/src/source-erf-dag.c
@@ -315,7 +315,7 @@ TmEcode ReceiveErfDagLoop(ThreadVars *tv, void *data, void *slot)
 
     while (1)
     {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }
 

diff --git a/src/source-napatech.c b/src/source-napatech.c
index 1939d900e2ea92e4ff61fd1eacf1ff84c626087d..f74d4ab16e5003ad3bf8e04bd47ca22fd75964b8 100644 (file)
--- a/src/source-napatech.c
+++ b/src/source-napatech.c
@@ -210,7 +210,7 @@ TmEcode NapatechFeedLoop(ThreadVars *tv, void *data, void *slot)
     ntv->slot = s->slot_next;
 
     while (1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }
 

diff --git a/src/source-pfring.c b/src/source-pfring.c
index fc35003dca2eb4d40208ee111fb31ad38f2899fd..e433fc40d555ed7ff9f21b4e6ed4e2fbce5d9dce 100644 (file)
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -252,7 +252,7 @@ TmEcode ReceivePfringLoop(ThreadVars *tv, void *data, void *slot)
     ptv->slot = s->slot_next;
 
     while(1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }