From abae556c886d94751128c0deb0feee9589fda4c3 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 19 Oct 2018 13:06:53 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso Acked-by: Phil Sutter --- include/ebtables/ethernetdb.h | 45 ------------------------------------------- include/xtables.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 include/ebtables/ethernetdb.h (limited to 'include') diff --git a/include/ebtables/ethernetdb.h b/include/ebtables/ethernetdb.h deleted file mode 100644 index 08b43354..00000000 --- a/include/ebtables/ethernetdb.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* All data returned by the network data base library are supplied in - host order and returned in network order (suitable for use in - system calls). */ - -#ifndef _ETHERNETDB_H -#define _ETHERNETDB_H 1 - -#include -#include -#include - -/* Absolute file name for network data base files. */ -#ifndef _XT_PATH_ETHERTYPES -#define _XT_PATH_ETHERTYPES "/etc/ethertypes" -#endif /* _PATH_ETHERTYPES */ - -struct xt_ethertypeent { - char *e_name; /* Official ethernet type name. */ - char **e_aliases; /* Alias list. */ - int e_ethertype; /* Ethernet type number. */ -}; - -/* Return entry from ethertype data base for network with NAME. */ -extern struct xt_ethertypeent *xtables_getethertypebyname(__const char *__name); - -/* Return entry from ethertype data base which number is PROTO. */ -extern struct xt_ethertypeent *xtables_getethertypebynumber(int __ethertype); - -#endif /* ethernetdb.h */ diff --git a/include/xtables.h b/include/xtables.h index bf169b08..8fb8843a 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -521,6 +521,18 @@ extern void xtables_ip6parse_any(const char *, struct in6_addr **, extern void xtables_ip6parse_multiple(const char *, struct in6_addr **, struct in6_addr **, unsigned int *); +/* Absolute file name for network data base files. */ +#define XT_PATH_ETHERTYPES "/etc/ethertypes" + +struct xt_ethertypeent { + char *e_name; /* Official ethernet type name. */ + char **e_aliases; /* Alias list. */ + int e_ethertype; /* Ethernet type number. */ +}; + +extern struct xt_ethertypeent *xtables_getethertypebyname(const char *name); +extern struct xt_ethertypeent *xtables_getethertypebynumber(int ethertype); + /** * Print the specified value to standard output, quoting dangerous * characters if required. -- cgit v1.2.3