diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-19 13:06:53 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-20 11:14:15 +0200 |
| commit | abae556c886d94751128c0deb0feee9589fda4c3 (patch) | |
| tree | f7fbcd9dcfa24ef80734d593ee80b847684e07b2 /iptables | |
| parent | c2d9ed99316f26de2d57d9798eee50034114540b (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 'iptables')
| -rw-r--r-- | iptables/nft-bridge.c | 1 | ||||
| -rw-r--r-- | iptables/xtables-eb-translate.c | 3 | ||||
| -rw-r--r-- | iptables/xtables-eb.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 876981ac..35c862cf 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -16,7 +16,6 @@ #include <xtables.h> #include <libiptc/libxtc.h> #include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> #include "nft-shared.h" #include "nft-bridge.h" diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c index 44419751..f98c3855 100644 --- a/iptables/xtables-eb-translate.c +++ b/iptables/xtables-eb-translate.c @@ -14,7 +14,6 @@ #include <linux/netfilter_bridge.h> #include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> #include <libiptc/libxtc.h> #include "xshared.h" @@ -474,7 +473,7 @@ print_zero: ent = xtables_getethertypebyname(optarg); if (!ent) xtables_error(PARAMETER_PROBLEM, - "Problem with the specified Ethernet protocol '%s', perhaps "_XT_PATH_ETHERTYPES " is missing", optarg); + "Problem with the specified Ethernet protocol '%s', perhaps "XT_PATH_ETHERTYPES " is missing", optarg); cs.eb.ethproto = ent->e_ethertype; } else cs.eb.ethproto = i; diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index ecb758c6..64f332c1 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -37,7 +37,6 @@ #include <linux/netfilter_bridge.h> #include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> #include <libiptc/libxtc.h> #include "xshared.h" #include "nft.h" @@ -1129,7 +1128,7 @@ print_zero: ent = xtables_getethertypebyname(optarg); if (!ent) xtables_error(PARAMETER_PROBLEM, - "Problem with the specified Ethernet protocol '%s', perhaps "_XT_PATH_ETHERTYPES " is missing", optarg); + "Problem with the specified Ethernet protocol '%s', perhaps "XT_PATH_ETHERTYPES " is missing", optarg); cs.eb.ethproto = ent->e_ethertype; } else cs.eb.ethproto = i; |