From: Pierre Chifflier <chifflier@edenwall.com>
To: netfilter-devel@vger.kernel.org
Cc: Pierre Chifflier <chifflier@edenwall.com>
Subject: [PATCH 2/3] bridge: add support for the EBT_QUEUE target
Date: Thu, 3 Feb 2011 15:32:19 +0100 [thread overview]
Message-ID: <1296743540-8148-3-git-send-email-chifflier@edenwall.com> (raw)
In-Reply-To: <4D49E1E0.50304@trash.net>
Add the EBT_QUEUE standard target for ebtables.
Signed-off-by: Pierre Chifflier <chifflier@edenwall.com>
---
include/linux/netfilter_bridge/ebtables.h | 3 ++-
net/bridge/netfilter/ebtables.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index 1c6f0c5..d5085eb 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -25,7 +25,8 @@
#define EBT_DROP -2
#define EBT_CONTINUE -3
#define EBT_RETURN -4
-#define NUM_STANDARD_TARGETS 4
+#define EBT_QUEUE -5
+#define NUM_STANDARD_TARGETS 5
/* ebtables target modules store the verdict inside an int. We can
* reclaim a part of this int for backwards compatible extensions.
* The 4 lsb are more than enough to store the verdict. */
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 5f1825d..156a7d7 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -251,6 +251,11 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb,
read_unlock_bh(&table->lock);
return NF_ACCEPT;
}
+ if (verdict == EBT_QUEUE) {
+ u32 queue_num = 1; // XXX hardcoded
+ read_unlock_bh(&table->lock);
+ return NF_QUEUE_NR(queue_num);
+ }
if (verdict == EBT_DROP) {
read_unlock_bh(&table->lock);
return NF_DROP;
--
1.7.2.3
next prev parent reply other threads:[~2011-02-03 15:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 20:55 ebtables_nfqueue: missing structure afinfo Pierre Chifflier
2011-01-25 10:34 ` Patrick McHardy
2011-02-02 19:22 ` Pierre Chifflier
2011-02-02 22:59 ` Patrick McHardy
2011-02-03 14:32 ` WIP/RFC: add new module ebt_NFQUEUE for ebtables Pierre Chifflier
2011-02-03 20:19 ` Bart De Schuymer
2011-02-04 10:05 ` Pierre Chifflier
2011-02-04 13:07 ` Patrick McHardy
2011-02-04 13:20 ` Pierre Chifflier
2011-02-04 13:21 ` Patrick McHardy
2011-02-03 14:32 ` [PATCH 1/3] Make the afinfo structure optional in nf_queue and nf_reinject Pierre Chifflier
2011-02-04 13:27 ` Patrick McHardy
2011-02-04 14:15 ` Pierre Chifflier
2011-02-03 14:32 ` Pierre Chifflier [this message]
2011-02-03 14:32 ` [PATCH 3/3] bridge: add new target NFQUEUE for ebtables Pierre Chifflier
2011-02-04 13:25 ` Patrick McHardy
2011-02-04 13:40 ` Pierre Chifflier
2011-02-04 13:41 ` Patrick McHardy
[not found] ` <4D5104C4.3010105@edenwall.com>
[not found] ` <4D59C047.5050404@trash.net>
2011-02-16 16:57 ` [RFH] " Pierre Chifflier
2011-02-17 10:47 ` Patrick McHardy
2011-02-17 13:37 ` Pierre Chifflier
2011-02-18 13:42 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296743540-8148-3-git-send-email-chifflier@edenwall.com \
--to=chifflier@edenwall.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).