summaryrefslogtreecommitdiffstats
path: root/iptables/nft-bridge.c
diff options
context:
space:
mode:
authorArturo Borrero <arturo.borrero.glez@gmail.com>2014-12-26 13:49:52 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2015-01-05 12:18:24 +0100
commit42cfeee024d0ba0c6b15645f829273ee3dcfa5c6 (patch)
treeed985a95e60b6f3f0310dcb5951b7885eae5e6a7 /iptables/nft-bridge.c
parent0e65c922fc0d51a8dff1a779863d4ae559aa9a4a (diff)
ebtables-compat: fix printing of extension
This patch fix printing of ebt extensions: % sudo ebtables-compat -L [...] Bridge chain: FORWARD, entries: 1, policy: ACCEPT --802_3-type 0x0012 -j ACCEPT [...] Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/nft-bridge.c')
-rw-r--r--iptables/nft-bridge.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index 807c4da0..90bcd63d 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -370,6 +370,7 @@ static void nft_bridge_print_header(unsigned int format, const char *chain,
static void nft_bridge_print_firewall(struct nft_rule *r, unsigned int num,
unsigned int format)
{
+ struct xtables_rule_match *matchp;
struct ebtables_command_state cs = {};
char *addr;
@@ -443,23 +444,13 @@ static void nft_bridge_print_firewall(struct nft_rule *r, unsigned int num,
print_iface(cs.fw.out);
}
- /* old code to adapt
- m_l = hlp->m_list;
- while (m_l) {
- m = ebt_find_match(m_l->m->u.name);
- if (!m)
- ebt_print_bug("Match not found");
- m->print(hlp, m_l->m);
- m_l = m_l->next;
+ for (matchp = cs.matches; matchp; matchp = matchp->next) {
+ if (matchp->match->print != NULL) {
+ matchp->match->print(&cs.fw, matchp->match->m,
+ format & FMT_NUMERIC);
+ }
}
- w_l = hlp->w_list;
- while (w_l) {
- w = ebt_find_watcher(w_l->w->u.name);
- if (!w)
- ebt_print_bug("Watcher not found");
- w->print(hlp, w_l->w);
- w_l = w_l->next;
- }*/
+
printf("-j ");
if (!(format & FMT_NOTARGET))
printf("%s", cs.jumpto);