From 56cccdfa6265eca04a5832c894c9a3993de61d35 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Mon, 11 Jan 2010 11:11:33 +0100 Subject: [PATCH] nfq: use switch instead of 'else if' This patch convert a 'else if' serie to a switch to increase the readability of the decision related code. Please enter the commit message for your changes. Lines starting --- src/source-nfq.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/source-nfq.c b/src/source-nfq.c index 59053ee6fb..144445b04d 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -390,25 +390,25 @@ void NFQSetVerdict(NFQThreadVars *t, Packet *p) { //printf("%p verdicting on queue %" PRIu32 "\n", t, t->queue_num); - if (p->action == ACTION_ALERT) { - verdict = NF_ACCEPT; - } else if (p->action == ACTION_PASS) { - verdict = NF_ACCEPT; - } else if (p->action == ACTION_DROP) { - verdict = NF_DROP; - } else if (p->action == ACTION_REJECT || - p->action == ACTION_REJECT_DST || - p->action == ACTION_REJECT_BOTH){ - verdict = NF_DROP; - } else { - /* a verdict we don't know about, drop to be sure */ - verdict = NF_DROP; - } - + switch (p->action) { + case ACTION_ALERT: + case ACTION_PASS: + verdict = NF_ACCEPT; #ifdef COUNTERS - if (verdict == NF_ACCEPT) t->accepted++; - if (verdict == NF_DROP) t->dropped++; + t->accepted++; #endif /* COUNTERS */ + break; + case ACTION_REJECT: + case ACTION_REJECT_DST: + case ACTION_REJECT_BOTH: + case ACTION_DROP: + default: + /* a verdict we don't know about, drop to be sure */ + verdict = NF_DROP; +#ifdef COUNTERS + t->dropped++; +#endif /* COUNTERS */ + } SCMutexLock(&t->mutex_qh); ret = nfq_set_verdict(t->qh, p->nfq_v.id, verdict, 0, NULL);