main/ebtables: purge due to iptables replacement

ebtables has been replaced by iptables
https://github.com/alpinelinux/aports/pull/5793#issuecomment-477503085

5 files changed, 0 insertions, 717 deletions

diff --git a/main/ebtables/APKBUILD b/main/ebtables/APKBUILD
deleted file mode 100644
index 774ddf301a..0000000000
--- a/main/ebtables/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Andrew Manison <amanison@anselsystems.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ebtables
-pkgver=2.0.10.4
-_realver=v${pkgver%.[0-9]}-${pkgver##*.}
-pkgrel=2
-pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge."
-url="http://ebtables.sourceforge.net/"
-arch="all"
-license="GPL"
-depends=
-makedepends="linux-headers"
-install=
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz
-	ebtables.initd
-	ebtables.confd
-	musl-fixes.patch
-	fix-extension-init.patch
-	"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$_realver
-	# patches
-	for i in $source; do
-		case "$i" in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/ebtables," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/ebtables,"\
-		-e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \
-		-e "s/^CFLAGS:=/CFLAGS?=/" \
-		-e "s,^CC:=,CC?=," Makefile
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$_realver
-
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	export LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
-	make CFLAGS="$CFLAGS" || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$_realver
-	make DESTDIR="$pkgdir" install
-	install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables
-	install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables
-}
-
-md5sums="506742a3d44b9925955425a659c1a8d0  ebtables-v2.0.10-4.tar.gz
-197852fae4bbac2fe75f81b36b6af852  ebtables.initd
-285089ba2d846e72e321a12e3da3cc96  ebtables.confd
-d443749e0a7bf542baec328b4520b36b  musl-fixes.patch
-9b7470d60e7496e898428724e8fe653a  fix-extension-init.patch"
-sha256sums="dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d  ebtables-v2.0.10-4.tar.gz
-893615d9f18eedd8e6d30252d6545b4ecaeca3f44219768f39c576ca949ec59a  ebtables.initd
-fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d  ebtables.confd
-5d2cefaa945acce3fbe19568002a26b405d7d91cb213655b5db38ca90ad73919  musl-fixes.patch
-dda93ff229e921d91efecb8667ed7dde2359fe5f13060fcd863a4acc54f7c750  fix-extension-init.patch"
-sha512sums="a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a  ebtables-v2.0.10-4.tar.gz
-c8fccc96610ddc24a3a0c7c2c9f2460b87e582424e338beeb20d77726b27324f89906ef853680e62912ed3544c967469870d78aa6e39de11efda072dd8a4a836  ebtables.initd
-b24afd1f5c2f200a1eec6ed7fd63500237dc168bfb9cc1297ffc288d12d30224a1ee84a7f61663daf408c42457dd7deac7594a23e448218806798294e9a1018d  ebtables.confd
-d72e606381a8790a11228a7cf25fd5acfeb036742ca8dbc8603d3b7baec7cc77846c2fe4b4cde698fb1bd8f272cd5d2e260db4363f2e3e69f29a88c95e156608  musl-fixes.patch
-d43ee171000c4a41063ba82a3659b0624654075d961711df45071a551a1e83f6aa3f51b4d537dc8c3b8001447fc8d6a6aeddf55569839c364c4c8471198b9383  fix-extension-init.patch"
diff --git a/main/ebtables/ebtables.confd b/main/ebtables/ebtables.confd
deleted file mode 100644
index db46ffb587..0000000000
--- a/main/ebtables/ebtables.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/conf.d/ebtables
-
-# Location in which ebtables initscript will save set rules on 
-# service shutdown
-EBTABLES_SAVE="/var/lib/ebtables/rules-save"
-
-# Options to pass to ebtables-save and ebtables-restore 
-SAVE_RESTORE_OPTIONS=""
-
-# Save state on stopping ebtables
-SAVE_ON_STOP="yes"
-
-# Tables to be saved and restored. If you have built ebtables as modules, you
-# may leave it blank. Otherwise, you MUST define which to control.
-TABLE_NAMES="filter nat broute"
diff --git a/main/ebtables/ebtables.initd b/main/ebtables/ebtables.initd
deleted file mode 100644
index c3e8ba92cb..0000000000
--- a/main/ebtables/ebtables.initd
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $
-
-extra_commands="save reload"
-extra_started_commands="panic"
-
-ebtables_bin="/sbin/ebtables"
-ebtables_save=${EBTABLES_SAVE}
-ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)
-if [ "$ebtables_tables" == "" ] ; then
-	ebtables_tables=${TABLE_NAMES}
-fi
-
-depend() {
-	before net
-	use logger
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		broute) chains="BROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${ebtables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkconfig() {
-	if [ ! -f ${ebtables_save} ] ; then
-		eerror "Not starting ebtables.  First create some rules then run:"
-		eerror "/etc/init.d/ebtables save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ebtables state and starting bridge firewall"
-	${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	ebegin "Stopping bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		set_table_policy $a ACCEPT
-
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-}
-
-reload() {
-	ebegin "Flushing bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
-	${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
-	eend $?
-}
-
-panic() {
-	service_started ebtables && svc_stop
-
-	local a
-	ebegin "Dropping all packets forwarded on bridges"
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}
diff --git a/main/ebtables/fix-extension-init.patch b/main/ebtables/fix-extension-init.patch
deleted file mode 100644
index 4812b4de2d..0000000000
--- a/main/ebtables/fix-extension-init.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- ebtables-v2.0.10-4.orig/extensions/Makefile
-+++ ebtables-v2.0.10-4/extensions/Makefile
-@@ -11,13 +11,13 @@
- EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
- 
- extensions/ebt_%.so: extensions/ebt_%.o
--	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $<
- 
- extensions/libebt_%.so: extensions/ebt_%.so
- 	mv $< $@
- 
- extensions/ebtable_%.so: extensions/ebtable_%.o
--	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $<
- 
- extensions/libebtable_%.so: extensions/ebtable_%.so
- 	mv $< $@
---- ebtables-v2.0.10-4.orig/extensions/ebt_802_3.c
-+++ ebtables-v2.0.10-4/extensions/ebt_802_3.c
-@@ -141,7 +141,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&_802_3_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_among.c
-+++ ebtables-v2.0.10-4/extensions/ebt_among.c
-@@ -491,7 +491,7 @@
- 	.extra_ops 	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&among_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_arp.c
-+++ ebtables-v2.0.10-4/extensions/ebt_arp.c
-@@ -362,7 +362,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&arp_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_arpreply.c
-+++ ebtables-v2.0.10-4/extensions/ebt_arpreply.c
-@@ -133,7 +133,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_target(&arpreply_target);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_ip.c
-+++ ebtables-v2.0.10-4/extensions/ebt_ip.c
-@@ -338,7 +338,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&ip_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_ip6.c
-+++ ebtables-v2.0.10-4/extensions/ebt_ip6.c
-@@ -556,7 +556,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&ip6_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_limit.c
-+++ ebtables-v2.0.10-4/extensions/ebt_limit.c
-@@ -212,7 +212,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&limit_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_log.c
-+++ ebtables-v2.0.10-4/extensions/ebt_log.c
-@@ -217,7 +217,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_watcher(&log_watcher);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_mark.c
-+++ ebtables-v2.0.10-4/extensions/ebt_mark.c
-@@ -172,7 +172,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_target(&mark_target);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_mark_m.c
-+++ ebtables-v2.0.10-4/extensions/ebt_mark_m.c
-@@ -121,7 +121,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&mark_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_nat.c
-+++ ebtables-v2.0.10-4/extensions/ebt_nat.c
-@@ -231,7 +231,7 @@
- 	.extra_ops	= opts_d,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_target(&snat_target);
- 	ebt_register_target(&dnat_target);
---- ebtables-v2.0.10-4.orig/extensions/ebt_nflog.c
-+++ ebtables-v2.0.10-4/extensions/ebt_nflog.c
-@@ -166,7 +166,7 @@
- 	.extra_ops = nflog_opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_watcher(&nflog_watcher);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_pkttype.c
-+++ ebtables-v2.0.10-4/extensions/ebt_pkttype.c
-@@ -125,7 +125,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&pkttype_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_redirect.c
-+++ ebtables-v2.0.10-4/extensions/ebt_redirect.c
-@@ -108,7 +108,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_target(&redirect_target);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_standard.c
-+++ ebtables-v2.0.10-4/extensions/ebt_standard.c
-@@ -84,7 +84,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_target(&standard);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_stp.c
-+++ ebtables-v2.0.10-4/extensions/ebt_stp.c
-@@ -337,7 +337,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&stp_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_ulog.c
-+++ ebtables-v2.0.10-4/extensions/ebt_ulog.c
-@@ -180,7 +180,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_watcher(&ulog_watcher);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebt_vlan.c
-+++ ebtables-v2.0.10-4/extensions/ebt_vlan.c
-@@ -181,7 +181,7 @@
- 	.extra_ops	= opts,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_match(&vlan_match);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebtable_broute.c
-+++ ebtables-v2.0.10-4/extensions/ebtable_broute.c
-@@ -23,7 +23,7 @@
- 	.help		= print_help,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_table(&table);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebtable_filter.c
-+++ ebtables-v2.0.10-4/extensions/ebtable_filter.c
-@@ -29,7 +29,7 @@
- 	.help		= print_help,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_table(&table);
- }
---- ebtables-v2.0.10-4.orig/extensions/ebtable_nat.c
-+++ ebtables-v2.0.10-4/extensions/ebtable_nat.c
-@@ -30,7 +30,7 @@
- 	.help		= print_help,
- };
- 
--void _init(void)
-+__attribute__((constructor)) static void extension_init(void)
- {
- 	ebt_register_table(&table);
- }
diff --git a/main/ebtables/musl-fixes.patch b/main/ebtables/musl-fixes.patch
deleted file mode 100644
index a174c07e7f..0000000000
--- a/main/ebtables/musl-fixes.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c1106a4..7e1b393 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ INITDIR:=/etc/rc.d/init.d
- SYSCONFIGDIR:=/etc/sysconfig
- DESTDIR:=
- 
--CFLAGS:=-Wall -Wunused -Werror
-+CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC -O3
- CC:=gcc
- 
-diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
-index f97d07e..8f5596c 100644
---- a/extensions/ebt_among.c
-+++ b/extensions/ebt_among.c
-@@ -12,14 +12,14 @@
- #include <getopt.h>
- #include <ctype.h>
- #include <unistd.h>
--#include "../include/ebtables_u.h"
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #include <netinet/ether.h>
-+#include "../include/ebtables_u.h"
- #include "../include/ethernetdb.h"
- #include <linux/if_ether.h>
- #include <linux/netfilter_bridge/ebt_among.h>
--#include <sys/mman.h>
--#include <sys/stat.h>
--#include <fcntl.h>
- 
- #define AMONG_DST '1'
- #define AMONG_SRC '2'
-diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
-index c3757f3..c5102a4 100644
---- a/extensions/ebt_arpreply.c
-+++ b/extensions/ebt_arpreply.c
-@@ -11,8 +11,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
--#include "../include/ebtables_u.h"
- #include <netinet/ether.h>
-+#include "../include/ebtables_u.h"
- #include <linux/netfilter_bridge/ebt_arpreply.h>
- 
- static int mac_supplied;
-diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
-index 0465e77..a1fc1ae 100644
---- a/extensions/ebt_ip6.c
-+++ b/extensions/ebt_ip6.c
-@@ -53,8 +53,8 @@ static const struct option opts[] =
- 
- struct icmpv6_names {
- 	const char *name;
--	u_int8_t type;
--	u_int8_t code_min, code_max;
-+	uint8_t type;
-+	uint8_t code_min, code_max;
- };
- 
- static const struct icmpv6_names icmpv6_codes[] = {
-diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
-index ee40e5c..d189a09 100644
---- a/extensions/ebt_limit.c
-+++ b/extensions/ebt_limit.c
-@@ -59,11 +59,11 @@ static void print_help(void)
- "                                default %u\n", EBT_LIMIT_BURST);
- }
- 
--static int parse_rate(const char *rate, u_int32_t *val)
-+static int parse_rate(const char *rate, uint32_t *val)
- {
- 	const char *delim;
--	u_int32_t r;
--	u_int32_t mult = 1;  /* Seconds by default. */
-+	uint32_t r;
-+	uint32_t mult = 1;  /* Seconds by default. */
- 
- 	delim = strchr(rate, '/');
- 	if (delim) {
-@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry,
- struct rates
- {
- 	const char *name;
--	u_int32_t mult;
-+	uint32_t mult;
- };
- 
- static struct rates g_rates[] =
-@@ -162,7 +162,7 @@ static struct rates g_rates[] =
- 	{ "sec", EBT_LIMIT_SCALE }
- };
- 
--static void print_rate(u_int32_t period)
-+static void print_rate(uint32_t period)
- {
- 	unsigned int i;
- 
-diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
-index e6afbf8..8d318d1 100644
---- a/extensions/ebt_nat.c
-+++ b/extensions/ebt_nat.c
-@@ -10,8 +10,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
--#include "../include/ebtables_u.h"
- #include <netinet/ether.h>
-+#include "../include/ebtables_u.h"
- #include <linux/netfilter_bridge/ebt_nat.h>
- 
- static int to_source_supplied, to_dest_supplied;
-diff --git a/include/ethernetdb.h b/include/ethernetdb.h
-index 46d8bfd..faf7d0f 100644
---- a/include/ethernetdb.h
-+++ b/include/ethernetdb.h
-@@ -30,6 +30,10 @@
- #define	_PATH_ETHERTYPES	"/etc/ethertypes"
- #endif				/* _PATH_ETHERTYPES */
- 
-+#ifndef __THROW
-+#define __THROW
-+#endif
-+
- struct ethertypeent {
- 	char *e_name;		/* Official ethernet type name.  */
- 	char **e_aliases;	/* Alias list.  */
-diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
-deleted file mode 100644
-index 28a15ff..0000000
---- a/include/linux/if_ether.h
-+++ /dev/null
-@@ -1,126 +0,0 @@
--/*
-- * INET		An implementation of the TCP/IP protocol suite for the LINUX
-- *		operating system.  INET is implemented using the  BSD Socket
-- *		interface as the means of communication with the user level.
-- *
-- *		Global definitions for the Ethernet IEEE 802.3 interface.
-- *
-- * Version:	@(#)if_ether.h	1.0.1a	02/08/94
-- *
-- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
-- *		Donald Becker, <becker@super.org>
-- *		Alan Cox, <alan@lxorguk.ukuu.org.uk>
-- *		Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
-- *
-- *		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.
-- */
--
--#ifndef _LINUX_IF_ETHER_H
--#define _LINUX_IF_ETHER_H
--
--#include <linux/types.h>
--
--/*
-- *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
-- *	and FCS/CRC (frame check sequence).
-- */
--
--#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
--#define ETH_HLEN	14		/* Total octets in header.	 */
--#define ETH_ZLEN	60		/* Min. octets in frame sans FCS */
--#define ETH_DATA_LEN	1500		/* Max. octets in payload	 */
--#define ETH_FRAME_LEN	1514		/* Max. octets in frame sans FCS */
--#define ETH_FCS_LEN	4		/* Octets in the FCS		 */
--
--/*
-- *	These are the defined Ethernet Protocol ID's.
-- */
--
--#define ETH_P_LOOP	0x0060		/* Ethernet Loopback packet	*/
--#define ETH_P_PUP	0x0200		/* Xerox PUP packet		*/
--#define ETH_P_PUPAT	0x0201		/* Xerox PUP Addr Trans packet	*/
--#define ETH_P_IP	0x0800		/* Internet Protocol packet	*/
--#define ETH_P_X25	0x0805		/* CCITT X.25			*/
--#define ETH_P_ARP	0x0806		/* Address Resolution packet	*/
--#define	ETH_P_BPQ	0x08FF		/* G8BPQ AX.25 Ethernet Packet	[ NOT AN OFFICIALLY REGISTERED ID ] */
--#define ETH_P_IEEEPUP	0x0a00		/* Xerox IEEE802.3 PUP packet */
--#define ETH_P_IEEEPUPAT	0x0a01		/* Xerox IEEE802.3 PUP Addr Trans packet */
--#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
--#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
--#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
--#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
--#define ETH_P_LAT       0x6004          /* DEC LAT                      */
--#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
--#define ETH_P_CUST      0x6006          /* DEC Customer use             */
--#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
--#define ETH_P_TEB	0x6558		/* Trans Ether Bridging		*/
--#define ETH_P_RARP      0x8035		/* Reverse Addr Res packet	*/
--#define ETH_P_ATALK	0x809B		/* Appletalk DDP		*/
--#define ETH_P_AARP	0x80F3		/* Appletalk AARP		*/
--#define ETH_P_8021Q	0x8100          /* 802.1Q VLAN Extended Header  */
--#define ETH_P_IPX	0x8137		/* IPX over DIX			*/
--#define ETH_P_IPV6	0x86DD		/* IPv6 over bluebook		*/
--#define ETH_P_PAUSE	0x8808		/* IEEE Pause frames. See 802.3 31B */
--#define ETH_P_SLOW	0x8809		/* Slow Protocol. See 802.3ad 43B */
--#define ETH_P_WCCP	0x883E		/* Web-cache coordination protocol
--					 * defined in draft-wilson-wrec-wccp-v2-00.txt */
--#define ETH_P_PPP_DISC	0x8863		/* PPPoE discovery messages     */
--#define ETH_P_PPP_SES	0x8864		/* PPPoE session messages	*/
--#define ETH_P_MPLS_UC	0x8847		/* MPLS Unicast traffic		*/
--#define ETH_P_MPLS_MC	0x8848		/* MPLS Multicast traffic	*/
--#define ETH_P_ATMMPOA	0x884c		/* MultiProtocol Over ATM	*/
--#define ETH_P_LINK_CTL	0x886c		/* HPNA, wlan link local tunnel */
--#define ETH_P_ATMFATE	0x8884		/* Frame-based ATM Transport
--					 * over Ethernet
--					 */
--#define ETH_P_PAE	0x888E		/* Port Access Entity (IEEE 802.1X) */
--#define ETH_P_AOE	0x88A2		/* ATA over Ethernet		*/
--#define ETH_P_TIPC	0x88CA		/* TIPC 			*/
--#define ETH_P_1588	0x88F7		/* IEEE 1588 Timesync */
--#define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */
--#define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */
--#define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
--
--/*
-- *	Non DIX types. Won't clash for 1500 types.
-- */
--
--#define ETH_P_802_3	0x0001		/* Dummy type for 802.3 frames  */
--#define ETH_P_AX25	0x0002		/* Dummy protocol id for AX.25  */
--#define ETH_P_ALL	0x0003		/* Every packet (be careful!!!) */
--#define ETH_P_802_2	0x0004		/* 802.2 frames 		*/
--#define ETH_P_SNAP	0x0005		/* Internal only		*/
--#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
--#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
--#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
--#define ETH_P_LOCALTALK 0x0009		/* Localtalk pseudo type 	*/
--#define ETH_P_CAN	0x000C		/* Controller Area Network      */
--#define ETH_P_PPPTALK	0x0010		/* Dummy type for Atalk over PPP*/
--#define ETH_P_TR_802_2	0x0011		/* 802.2 frames 		*/
--#define ETH_P_MOBITEX	0x0015		/* Mobitex (kaz@cafe.net)	*/
--#define ETH_P_CONTROL	0x0016		/* Card specific control frames */
--#define ETH_P_IRDA	0x0017		/* Linux-IrDA			*/
--#define ETH_P_ECONET	0x0018		/* Acorn Econet			*/
--#define ETH_P_HDLC	0x0019		/* HDLC frames			*/
--#define ETH_P_ARCNET	0x001A		/* 1A for ArcNet :-)            */
--#define ETH_P_DSA	0x001B		/* Distributed Switch Arch.	*/
--#define ETH_P_TRAILER	0x001C		/* Trailer switch tagging	*/
--#define ETH_P_PHONET	0x00F5		/* Nokia Phonet frames          */
--#define ETH_P_IEEE802154 0x00F6		/* IEEE802.15.4 frame		*/
--#define ETH_P_CAIF	0x00F7		/* ST-Ericsson CAIF protocol	*/
--
--/*
-- *	This is an Ethernet frame header.
-- */
--
--struct ethhdr {
--	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/
--	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/
--	__be16		h_proto;		/* packet type ID field	*/
--} __attribute__((packed));
--
--
--#endif	/* _LINUX_IF_ETHER_H */
-diff --git a/useful_functions.c b/useful_functions.c
-index d20b68e..93ef06f 100644
---- a/useful_functions.c
-+++ b/useful_functions.c
-@@ -22,8 +22,7 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
--#include "include/ebtables_u.h"
--#include "include/ethernetdb.h"
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <netinet/ether.h>
- #include <string.h>
-@@ -33,6 +32,8 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include "include/ebtables_u.h"
-+#include "include/ethernetdb.h"
- 
- const unsigned char mac_type_unicast[ETH_ALEN] =   {0,0,0,0,0,0};
- const unsigned char msk_type_unicast[ETH_ALEN] =   {1,0,0,0,0,0};