summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-10-19 13:06:53 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-10-20 11:14:15 +0200
commitabae556c886d94751128c0deb0feee9589fda4c3 (patch)
treef7fbcd9dcfa24ef80734d593ee80b847684e07b2 /extensions
parentc2d9ed99316f26de2d57d9798eee50034114540b (diff)
libxtables: expose new etherdb lookup function through libxtables API
This is used from extensions and included in libxtables, so we have to make them public. Fixes: 31f1434dfe37 ("libxtables: Integrate getethertype.c from xtables core") Reported-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libebt_arp.c4
-rw-r--r--extensions/libebt_vlan.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/extensions/libebt_arp.c b/extensions/libebt_arp.c
index 3a4c29b5..522c57c0 100644
--- a/extensions/libebt_arp.c
+++ b/extensions/libebt_arp.c
@@ -14,7 +14,7 @@
#include <xtables.h>
#include <netinet/ether.h>
-#include <ebtables/ethernetdb.h>
+#include <xtables.h>
#include <net/if_arp.h>
#include <linux/netfilter_bridge/ebt_arp.h>
#include "iptables/nft.h"
@@ -75,7 +75,7 @@ static void brarp_print_help(void)
printf(" %d = %s\n", i + 1, opcodes[i]);
printf(
" hardware type string: 1 = Ethernet\n"
-" protocol type string: see "_XT_PATH_ETHERTYPES"\n");
+" protocol type string: see "XT_PATH_ETHERTYPES"\n");
}
#define OPT_OPCODE 0x01
diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c
index 57c4dd5b..a2a9dcce 100644
--- a/extensions/libebt_vlan.c
+++ b/extensions/libebt_vlan.c
@@ -12,7 +12,6 @@
#include <getopt.h>
#include <ctype.h>
#include <xtables.h>
-#include <ebtables/ethernetdb.h>
#include <linux/netfilter_bridge/ebt_vlan.h>
#include <linux/if_ether.h>
#include "iptables/nft.h"