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 /include | |
| 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 'include')
| -rw-r--r-- | include/ebtables/ethernetdb.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/include/ebtables/ethernetdb.h b/include/ebtables/ethernetdb.h index 1683abe0..08b43354 100644 --- a/include/ebtables/ethernetdb.h +++ b/include/ebtables/ethernetdb.h @@ -26,32 +26,20 @@ #include <stdint.h> /* Absolute file name for network data base files. */ -#ifndef _PATH_ETHERTYPES -#define _PATH_ETHERTYPES "/etc/ethertypes" +#ifndef _XT_PATH_ETHERTYPES +#define _XT_PATH_ETHERTYPES "/etc/ethertypes" #endif /* _PATH_ETHERTYPES */ -struct ethertypeent { +struct xt_ethertypeent { char *e_name; /* Official ethernet type name. */ char **e_aliases; /* Alias list. */ int e_ethertype; /* Ethernet type number. */ }; -/* Open ethertype data base files and mark them as staying open even - after a later search if STAY_OPEN is non-zero. */ -extern void setethertypeent(int __stay_open); - -/* Close ethertype data base files and clear `stay open' flag. */ -extern void endethertypeent(void); - -/* Get next entry from ethertype data base file. Open data base if - necessary. */ -extern struct ethertypeent *getethertypeent(void); - /* Return entry from ethertype data base for network with NAME. */ -extern struct ethertypeent *getethertypebyname(__const char *__name); +extern struct xt_ethertypeent *xtables_getethertypebyname(__const char *__name); /* Return entry from ethertype data base which number is PROTO. */ -extern struct ethertypeent *getethertypebynumber(int __ethertype); - +extern struct xt_ethertypeent *xtables_getethertypebynumber(int __ethertype); #endif /* ethernetdb.h */ |