]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Fix invalid usage of operator.
authorEric Leblond <eric@regit.org>
Fri, 7 Sep 2012 11:52:21 +0000 (13:52 +0200)
committerVictor Julien <victor@inliniac.net>
Sat, 8 Sep 2012 19:12:43 +0000 (21:12 +0200)
src/source-pcap-file.c
src/source-pcap.c

index 96297e46c110143cb6d984c4915ba4f3c0433c3e..5174ea92919089e84dfb8de89782b801d9f08922 100644 (file)
@@ -167,7 +167,7 @@ TmEcode ReceivePcapFileLoop(ThreadVars *tv, void *data, void *slot)
     ptv->cb_result = TM_ECODE_OK;
 
     while (1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }
 
index 75b7617e480fcbacdf43254b879a22fde13c0a18..657e1229db8e97c6030810babd04f32e4be4e28b 100644 (file)
@@ -267,7 +267,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
     ptv->cb_result = TM_ECODE_OK;
 
     while (1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }