diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-19 12:55:16 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-20 11:14:10 +0200 |
commit | c2d9ed99316f26de2d57d9798eee50034114540b (patch) | |
tree | 888e14d5353c8fb9438cca67446e0b69b5f433be /iptables | |
parent | 5a44360e54c455871d3576a0a4303afbfb82088f (diff) |
libxtables: prefix exported new functions for etherdb lookups
To avoid symbol pollution, place them under the xt_ and xtables_ prefix
name.
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 | 4 | ||||
-rw-r--r-- | iptables/xtables-eb-translate.c | 6 | ||||
-rw-r--r-- | iptables/xtables-eb.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 7e659bb5..876981ac 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -421,7 +421,7 @@ static void print_mac(char option, const unsigned char *mac, static void print_protocol(uint16_t ethproto, bool invert, unsigned int bitmask) { - struct ethertypeent *ent; + struct xt_ethertypeent *ent; /* Dont print anything about the protocol if no protocol was * specified, obviously this means any protocol will do. */ @@ -437,7 +437,7 @@ static void print_protocol(uint16_t ethproto, bool invert, unsigned int bitmask) return; } - ent = getethertypebynumber(ntohs(ethproto)); + ent = xtables_getethertypebynumber(ntohs(ethproto)); if (!ent) printf("0x%x ", ntohs(ethproto)); else diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c index 07d61776..44419751 100644 --- a/iptables/xtables-eb-translate.c +++ b/iptables/xtables-eb-translate.c @@ -465,16 +465,16 @@ print_zero: xtables_error(PARAMETER_PROBLEM, "Problem with the specified protocol"); if (*buffer != '\0') { - struct ethertypeent *ent; + struct xt_ethertypeent *ent; if (!strcasecmp(optarg, "LENGTH")) { cs.eb.bitmask |= EBT_802_3; break; } - ent = getethertypebyname(optarg); + ent = xtables_getethertypebyname(optarg); if (!ent) xtables_error(PARAMETER_PROBLEM, - "Problem with the specified Ethernet protocol '%s', perhaps "_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 84d554e9..ecb758c6 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -1120,16 +1120,16 @@ print_zero: xtables_error(PARAMETER_PROBLEM, "Problem with the specified protocol"); if (*buffer != '\0') { - struct ethertypeent *ent; + struct xt_ethertypeent *ent; if (!strcasecmp(optarg, "LENGTH")) { cs.eb.bitmask |= EBT_802_3; break; } - ent = getethertypebyname(optarg); + ent = xtables_getethertypebyname(optarg); if (!ent) xtables_error(PARAMETER_PROBLEM, - "Problem with the specified Ethernet protocol '%s', perhaps "_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; |