From df4c642c708321aa15ef1dfacf1b1763a9d19c9c Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sat, 6 Feb 2010 14:54:17 +0100 Subject: [PATCH] Fix weird compile error --- src/action-globals.h | 15 ++++++--------- src/source-nfq.c | 10 ++-------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/action-globals.h b/src/action-globals.h index 85726b6b38..4b1071e1fb 100644 --- a/src/action-globals.h +++ b/src/action-globals.h @@ -1,15 +1,12 @@ /* Copyright (c) 2008 Victor Julien */ #ifndef __ACTION_GLOBALS_H__ #define __ACTION_GLOBALS_H__ - /* Changing them as flags, so later we can have alerts * and drop simultaneously */ -#define ACTION_ALERT 0x01 -#define ACTION_DROP 0x02 -#define ACTION_REJECT 0x04 -#define ACTION_REJECT_DST 0x08 -#define ACTION_REJECT_BOTH 0x10 -#define ACTION_PASS 0x20 - - +#define ACTION_ALERT 0x01 +#define ACTION_DROP 0x02 +#define ACTION_REJECT 0x04 +#define ACTION_REJECT_DST 0x08 +#define ACTION_REJECT_BOTH 0x10 +#define ACTION_PASS 0x20 #endif /* __ACTION_GLOBALS_H__ */ diff --git a/src/source-nfq.c b/src/source-nfq.c index 501ac16add..19bf994822 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -408,21 +408,15 @@ void NFQSetVerdict(NFQThreadVars *t, Packet *p) { //printf("%p verdicting on queue %" PRIu32 "\n", t, t->queue_num); if (p->action & ACTION_REJECT || p->action & ACTION_REJECT_BOTH || - p->action & ACTION_REJECT_DST || p->action & ACTION_DROP) { + p->action & ACTION_REJECT_DST || p->action & ACTION_DROP) { verdict = NF_DROP; #ifdef COUNTERS t->dropped++; #endif /* COUNTERS */ - } else if (p->action & ACTION_ALERT || p->action & ACTION_ALERT) { + } else { verdict = NF_ACCEPT; #ifdef COUNTERS t->accepted++; -#endif /* COUNTERS */ - } else { - /* a verdict we don't know about, drop to be sure */ - verdict = NF_DROP; -#ifdef COUNTERS - t->dropped++; #endif /* COUNTERS */ }