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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/libebt_arp.c | 6 | ||||
| -rw-r--r-- | extensions/libebt_vlan.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extensions/libebt_arp.c b/extensions/libebt_arp.c index dc8e306a..3a4c29b5 100644 --- a/extensions/libebt_arp.c +++ b/extensions/libebt_arp.c @@ -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 "_PATH_ETHERTYPES"\n"); +" protocol type string: see "_XT_PATH_ETHERTYPES"\n"); } #define OPT_OPCODE 0x01 @@ -262,9 +262,9 @@ brarp_parse(int c, char **argv, int invert, unsigned int *flags, i = strtol(optarg, &end, 16); if (i < 0 || i >= (0x1 << 16) || *end !='\0') { - struct ethertypeent *ent; + struct xt_ethertypeent *ent; - ent = getethertypebyname(argv[optind - 1]); + ent = xtables_getethertypebyname(argv[optind - 1]); if (!ent) xtables_error(PARAMETER_PROBLEM, "Problem with specified ARP " "protocol type"); diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c index 52cc99fa..57c4dd5b 100644 --- a/extensions/libebt_vlan.c +++ b/extensions/libebt_vlan.c @@ -55,7 +55,7 @@ brvlan_parse(int c, char **argv, int invert, unsigned int *flags, const void *entry, struct xt_entry_match **match) { struct ebt_vlan_info *vlaninfo = (struct ebt_vlan_info *) (*match)->data; - struct ethertypeent *ethent; + struct xt_ethertypeent *ethent; char *end; struct ebt_vlan_info local; @@ -86,7 +86,7 @@ brvlan_parse(int c, char **argv, int invert, unsigned int *flags, vlaninfo->invflags |= EBT_VLAN_ENCAP; local.encap = strtoul(optarg, &end, 16); if (*end != '\0') { - ethent = getethertypebyname(optarg); + ethent = xtables_getethertypebyname(optarg); if (ethent == NULL) xtables_error(PARAMETER_PROBLEM, "Unknown --vlan-encap value ('%s')", optarg); local.encap = ethent->e_ethertype; |