use official ebtables patch

SVN-Revision: 137

1 files changed, 2663 insertions, 3439 deletions

diff --git a/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch b/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch
index 54c6add8ac..a6d594d05f 100644
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch
@@ -1,7 +1,40 @@
-diff -Nurb linux.stock/include/linux/if_bridge.h linux/include/linux/if_bridge.h
---- linux.stock/include/linux/if_bridge.h	2003-10-14 04:09:25.000000000 -0400
-+++ linux/include/linux/if_bridge.h	2004-07-10 23:46:39.000000000 -0400
-@@ -102,7 +102,8 @@
+--- linux-2.4.21/net/bridge/br_private.h	Mon Feb 25 20:38:14 2002
++++ linux-2.4.21-ebt-brnf-3/net/bridge/br_private.h	Fri Aug  8 01:09:06 2003
+@@ -144,8 +144,10 @@ extern void br_fdb_insert(struct net_bri
+ /* br_forward.c */
+ extern void br_deliver(struct net_bridge_port *to,
+ 		struct sk_buff *skb);
++extern int br_dev_queue_push_xmit(struct sk_buff *skb);
+ extern void br_forward(struct net_bridge_port *to,
+ 		struct sk_buff *skb);
++extern int br_forward_finish(struct sk_buff *skb);
+ extern void br_flood_deliver(struct net_bridge *br,
+ 		      struct sk_buff *skb,
+ 		      int clone);
+@@ -166,7 +168,8 @@ extern void br_get_port_ifindices(struct
+ 			   int *ifindices);
+ 
+ /* br_input.c */
+-extern void br_handle_frame(struct sk_buff *skb);
++extern int br_handle_frame_finish(struct sk_buff *skb);
++extern int br_handle_frame(struct sk_buff *skb);
+ 
+ /* br_ioctl.c */
+ extern void br_call_ioctl_atomic(void (*fn)(void));
+@@ -176,6 +179,10 @@ extern int br_ioctl(struct net_bridge *b
+ 	     unsigned long arg1,
+ 	     unsigned long arg2);
+ extern int br_ioctl_deviceless_stub(unsigned long arg);
++
++/* br_netfilter.c */
++extern int br_netfilter_init(void);
++extern void br_netfilter_fini(void);
+ 
+ /* br_stp.c */
+ extern int br_is_root_bridge(struct net_bridge *br);
+--- linux-2.4.21/include/linux/if_bridge.h	Thu Nov 22 20:47:12 2001
++++ linux-2.4.21-ebt-brnf-3/include/linux/if_bridge.h	Fri Aug  8 01:09:06 2003
+@@ -102,7 +102,8 @@ struct net_bridge;
  struct net_bridge_port;
  
  extern int (*br_ioctl_hook)(unsigned long arg);
@@ -11,1154 +44,126 @@ diff -Nurb linux.stock/include/linux/if_bridge.h linux/include/linux/if_bridge.h
  
  #endif
  
-diff -Nurb linux.stock/include/linux/netfilter.h linux/include/linux/netfilter.h
---- linux.stock/include/linux/netfilter.h	2004-07-10 23:30:09.000000000 -0400
-+++ linux/include/linux/netfilter.h	2004-07-10 23:46:39.000000000 -0400
-@@ -119,17 +119,23 @@
- /* This is gross, but inline doesn't cut it for avoiding the function
-    call in fast path: gcc doesn't inline (needs value tracking?). --RR */
- #ifdef CONFIG_NETFILTER_DEBUG
--#define NF_HOOK nf_hook_slow
-+#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
-+nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
-+#define NF_HOOK_THRESH nf_hook_slow
- #else
- #define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
- (list_empty(&nf_hooks[(pf)][(hook)])					\
-  ? (okfn)(skb)								\
-- : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn)))
-+ : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN))
-+#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh)	\
-+(list_empty(&nf_hooks[(pf)][(hook)])					\
-+ ? (okfn)(skb)								\
-+ : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), (thresh)))
- #endif
- 
- int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
- 		 struct net_device *indev, struct net_device *outdev,
--		 int (*okfn)(struct sk_buff *));
-+		 int (*okfn)(struct sk_buff *), int thresh);
- 
- /* Call setsockopt() */
- int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt, 
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_802_3.h linux/include/linux/netfilter_bridge/ebt_802_3.h
---- linux.stock/include/linux/netfilter_bridge/ebt_802_3.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_802_3.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,60 @@
-+#ifndef __LINUX_BRIDGE_EBT_802_3_H
-+#define __LINUX_BRIDGE_EBT_802_3_H
-+
-+#define EBT_802_3_SAP 0x01
-+#define EBT_802_3_TYPE 0x02
-+
-+#define EBT_802_3_MATCH "802_3"
-+
-+/*
-+ * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
-+ * to discover what kind of packet we're carrying. 
-+ */
-+#define CHECK_TYPE 0xaa
-+
-+/*
-+ * Control field may be one or two bytes.  If the first byte has
-+ * the value 0x03 then the entire length is one byte, otherwise it is two.
-+ * One byte controls are used in Unnumbered Information frames.
-+ * Two byte controls are used in Numbered Information frames.
-+ */
-+#define IS_UI 0x03
-+
-+#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
-+
-+/* ui has one byte ctrl, ni has two */
-+struct hdr_ui {
-+	uint8_t dsap;
-+	uint8_t ssap;
-+	uint8_t ctrl;
-+	uint8_t orig[3];
-+	uint16_t type;
-+};
-+
-+struct hdr_ni {
-+	uint8_t dsap;
-+	uint8_t ssap;
-+	uint16_t ctrl;
-+	uint8_t  orig[3];
-+	uint16_t type;
-+};
-+
-+struct ebt_802_3_hdr {
-+	uint8_t  daddr[6];
-+	uint8_t  saddr[6];
-+	uint16_t len;
-+	union {
-+		struct hdr_ui ui;
-+		struct hdr_ni ni;
-+	} llc;
-+};
-+
-+struct ebt_802_3_info 
-+{
-+	uint8_t  sap;
-+	uint16_t type;
-+	uint8_t  bitmask;
-+	uint8_t  invflags;
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_among.h linux/include/linux/netfilter_bridge/ebt_among.h
---- linux.stock/include/linux/netfilter_bridge/ebt_among.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_among.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,65 @@
-+#ifndef __LINUX_BRIDGE_EBT_AMONG_H
-+#define __LINUX_BRIDGE_EBT_AMONG_H
-+
-+#define EBT_AMONG_DST 0x01
-+#define EBT_AMONG_SRC 0x02
-+
-+/* Grzegorz Borowiak <grzes@gnu.univ.gda.pl> 2003
-+ * 
-+ * Write-once-read-many hash table, used for checking if a given
-+ * MAC address belongs to a set or not and possibly for checking
-+ * if it is related with a given IPv4 address.
-+ *
-+ * The hash value of an address is its last byte.
-+ * 
-+ * In real-world ethernet addresses, values of the last byte are
-+ * evenly distributed and there is no need to consider other bytes.
-+ * It would only slow the routines down.
-+ *
-+ * For MAC address comparison speedup reasons, we introduce a trick.
-+ * MAC address is mapped onto an array of two 32-bit integers.
-+ * This pair of integers is compared with MAC addresses in the
-+ * hash table, which are stored also in form of pairs of integers
-+ * (in `cmp' array). This is quick as it requires only two elementary
-+ * number comparisons in worst case. Further, we take advantage of
-+ * fact that entropy of 3 last bytes of address is larger than entropy
-+ * of 3 first bytes. So first we compare 4 last bytes of addresses and
-+ * if they are the same we compare 2 first.
-+ *
-+ * Yes, it is a memory overhead, but in 2003 AD, who cares?
-+ */
-+
-+struct ebt_mac_wormhash_tuple
-+{
-+	uint32_t cmp[2];
-+	uint32_t ip;
-+};
-+
-+struct ebt_mac_wormhash
-+{
-+	int table[257];
-+	int poolsize;
-+	struct ebt_mac_wormhash_tuple pool[0];
-+};
-+
-+#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \
-+		+ (x)->poolsize * sizeof(struct ebt_mac_wormhash_tuple) : 0)
-+
-+struct ebt_among_info
-+{
-+	int wh_dst_ofs;
-+	int wh_src_ofs;
-+	int bitmask;
-+};
-+
-+#define EBT_AMONG_DST_NEG 0x1
-+#define EBT_AMONG_SRC_NEG 0x2
-+
-+#define ebt_among_wh_dst(x) ((x)->wh_dst_ofs ? \
-+	(struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_dst_ofs) : NULL)
-+#define ebt_among_wh_src(x) ((x)->wh_src_ofs ? \
-+	(struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_src_ofs) : NULL)
-+
-+#define EBT_AMONG_MATCH "among"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arp.h linux/include/linux/netfilter_bridge/ebt_arp.h
---- linux.stock/include/linux/netfilter_bridge/ebt_arp.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_arp.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,32 @@
-+#ifndef __LINUX_BRIDGE_EBT_ARP_H
-+#define __LINUX_BRIDGE_EBT_ARP_H
-+
-+#define EBT_ARP_OPCODE 0x01
-+#define EBT_ARP_HTYPE 0x02
-+#define EBT_ARP_PTYPE 0x04
-+#define EBT_ARP_SRC_IP 0x08
-+#define EBT_ARP_DST_IP 0x10
-+#define EBT_ARP_SRC_MAC 0x20
-+#define EBT_ARP_DST_MAC 0x40
-+#define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \
-+   EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)
-+#define EBT_ARP_MATCH "arp"
-+
-+struct ebt_arp_info
-+{
-+	uint16_t htype;
-+	uint16_t ptype;
-+	uint16_t opcode;
-+	uint32_t saddr;
-+	uint32_t smsk;
-+	uint32_t daddr;
-+	uint32_t dmsk;
-+	unsigned char smaddr[ETH_ALEN];
-+	unsigned char smmsk[ETH_ALEN];
-+	unsigned char dmaddr[ETH_ALEN];
-+	unsigned char dmmsk[ETH_ALEN];
-+	uint8_t  bitmask;
-+	uint8_t  invflags;
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h linux/include/linux/netfilter_bridge/ebt_arpreply.h
---- linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_arpreply.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,11 @@
-+#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
-+#define __LINUX_BRIDGE_EBT_ARPREPLY_H
-+
-+struct ebt_arpreply_info
-+{
-+	unsigned char mac[ETH_ALEN];
-+	int target;
-+};
-+#define EBT_ARPREPLY_TARGET "arpreply"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_ip.h linux/include/linux/netfilter_bridge/ebt_ip.h
---- linux.stock/include/linux/netfilter_bridge/ebt_ip.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_ip.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,43 @@
-+/*
-+ *  ebt_ip
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *
-+ *  April, 2002
-+ *
-+ *  Changes:
-+ *    added ip-sport and ip-dport
-+ *    Innominate Security Technologies AG <mhopf@innominate.com>
-+ *    September, 2002
-+ */
-+
-+#ifndef __LINUX_BRIDGE_EBT_IP_H
-+#define __LINUX_BRIDGE_EBT_IP_H
-+
-+#define EBT_IP_SOURCE 0x01
-+#define EBT_IP_DEST 0x02
-+#define EBT_IP_TOS 0x04
-+#define EBT_IP_PROTO 0x08
-+#define EBT_IP_SPORT 0x10
-+#define EBT_IP_DPORT 0x20
-+#define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
-+ EBT_IP_SPORT | EBT_IP_DPORT )
-+#define EBT_IP_MATCH "ip"
-+
-+// the same values are used for the invflags
-+struct ebt_ip_info
-+{
-+	uint32_t saddr;
-+	uint32_t daddr;
-+	uint32_t smsk;
-+	uint32_t dmsk;
-+	uint8_t  tos;
-+	uint8_t  protocol;
-+	uint8_t  bitmask;
-+	uint8_t  invflags;
-+	uint16_t sport[2];
-+	uint16_t dport[2];
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_limit.h linux/include/linux/netfilter_bridge/ebt_limit.h
---- linux.stock/include/linux/netfilter_bridge/ebt_limit.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_limit.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,23 @@
-+#ifndef __LINUX_BRIDGE_EBT_LIMIT_H
-+#define __LINUX_BRIDGE_EBT_LIMIT_H
-+
-+#define EBT_LIMIT_MATCH "limit"
-+
-+/* timings are in milliseconds. */
-+#define EBT_LIMIT_SCALE 10000
-+
-+/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-+   seconds, or one every 59 hours. */
-+
-+struct ebt_limit_info
-+{
-+	u_int32_t avg;    /* Average secs between packets * scale */
-+	u_int32_t burst;  /* Period multiplier for upper limit. */
-+
-+	/* Used internally by the kernel */
-+	unsigned long prev;
-+	u_int32_t credit;
-+	u_int32_t credit_cap, cost;
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_log.h linux/include/linux/netfilter_bridge/ebt_log.h
---- linux.stock/include/linux/netfilter_bridge/ebt_log.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_log.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,17 @@
-+#ifndef __LINUX_BRIDGE_EBT_LOG_H
-+#define __LINUX_BRIDGE_EBT_LOG_H
-+
-+#define EBT_LOG_IP 0x01 // if the frame is made by ip, log the ip information
-+#define EBT_LOG_ARP 0x02
-+#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP)
-+#define EBT_LOG_PREFIX_SIZE 30
-+#define EBT_LOG_WATCHER "log"
-+
-+struct ebt_log_info
-+{
-+	uint8_t loglevel;
-+	uint8_t prefix[EBT_LOG_PREFIX_SIZE];
-+	uint32_t bitmask;
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h linux/include/linux/netfilter_bridge/ebt_mark_m.h
---- linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_mark_m.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,15 @@
-+#ifndef __LINUX_BRIDGE_EBT_MARK_M_H
-+#define __LINUX_BRIDGE_EBT_MARK_M_H
-+
-+#define EBT_MARK_AND 0x01
-+#define EBT_MARK_OR 0x02
-+#define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR)
-+struct ebt_mark_m_info
-+{
-+	unsigned long mark, mask;
-+	uint8_t invert;
-+	uint8_t bitmask;
-+};
-+#define EBT_MARK_MATCH "mark_m"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h linux/include/linux/netfilter_bridge/ebt_mark_t.h
---- linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_mark_t.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,12 @@
-+#ifndef __LINUX_BRIDGE_EBT_MARK_T_H
-+#define __LINUX_BRIDGE_EBT_MARK_T_H
-+
-+struct ebt_mark_t_info
-+{
-+	unsigned long mark;
-+	// EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN
-+	int target;
-+};
-+#define EBT_MARK_TARGET "mark"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_nat.h linux/include/linux/netfilter_bridge/ebt_nat.h
---- linux.stock/include/linux/netfilter_bridge/ebt_nat.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_nat.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,13 @@
-+#ifndef __LINUX_BRIDGE_EBT_NAT_H
-+#define __LINUX_BRIDGE_EBT_NAT_H
-+
-+struct ebt_nat_info
-+{
-+	unsigned char mac[ETH_ALEN];
-+	// EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN
-+	int target;
-+};
-+#define EBT_SNAT_TARGET "snat"
-+#define EBT_DNAT_TARGET "dnat"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h linux/include/linux/netfilter_bridge/ebt_pkttype.h
---- linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_pkttype.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,11 @@
-+#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
-+#define __LINUX_BRIDGE_EBT_PKTTYPE_H
-+
-+struct ebt_pkttype_info
-+{
-+	uint8_t pkt_type;
-+	uint8_t invert;
-+};
-+#define EBT_PKTTYPE_MATCH "pkttype"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_redirect.h linux/include/linux/netfilter_bridge/ebt_redirect.h
---- linux.stock/include/linux/netfilter_bridge/ebt_redirect.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_redirect.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,11 @@
-+#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
-+#define __LINUX_BRIDGE_EBT_REDIRECT_H
-+
-+struct ebt_redirect_info
-+{
-+	// EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN
-+	int target;
-+};
-+#define EBT_REDIRECT_TARGET "redirect"
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_stp.h linux/include/linux/netfilter_bridge/ebt_stp.h
---- linux.stock/include/linux/netfilter_bridge/ebt_stp.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_stp.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,46 @@
-+#ifndef __LINUX_BRIDGE_EBT_STP_H
-+#define __LINUX_BRIDGE_EBT_STP_H
-+
-+#define EBT_STP_TYPE		0x0001
-+
-+#define EBT_STP_FLAGS		0x0002
-+#define EBT_STP_ROOTPRIO	0x0004
-+#define EBT_STP_ROOTADDR	0x0008
-+#define EBT_STP_ROOTCOST	0x0010
-+#define EBT_STP_SENDERPRIO	0x0020
-+#define EBT_STP_SENDERADDR	0x0040
-+#define EBT_STP_PORT		0x0080
-+#define EBT_STP_MSGAGE		0x0100
-+#define EBT_STP_MAXAGE		0x0200
-+#define EBT_STP_HELLOTIME	0x0400
-+#define EBT_STP_FWDD		0x0800
-+
-+#define EBT_STP_MASK		0x0fff
-+#define EBT_STP_CONFIG_MASK	0x0ffe
-+
-+#define EBT_STP_MATCH "stp"
-+
-+struct ebt_stp_config_info
-+{
-+	uint8_t flags;
-+	uint16_t root_priol, root_priou;
-+	char root_addr[6], root_addrmsk[6];
-+	uint32_t root_costl, root_costu;
-+	uint16_t sender_priol, sender_priou;
-+	char sender_addr[6], sender_addrmsk[6];
-+	uint16_t portl, portu;
-+	uint16_t msg_agel, msg_ageu;
-+	uint16_t max_agel, max_ageu;
-+	uint16_t hello_timel, hello_timeu;
-+	uint16_t forward_delayl, forward_delayu;
-+};
-+
-+struct ebt_stp_info
-+{
-+	uint8_t type;
-+	struct ebt_stp_config_info config;
-+	uint16_t bitmask;
-+	uint16_t invflags;
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_vlan.h linux/include/linux/netfilter_bridge/ebt_vlan.h
---- linux.stock/include/linux/netfilter_bridge/ebt_vlan.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebt_vlan.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,20 @@
-+#ifndef __LINUX_BRIDGE_EBT_VLAN_H
-+#define __LINUX_BRIDGE_EBT_VLAN_H
-+
-+#define EBT_VLAN_ID	0x01
-+#define EBT_VLAN_PRIO	0x02
-+#define EBT_VLAN_ENCAP	0x04
-+#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO | EBT_VLAN_ENCAP)
-+#define EBT_VLAN_MATCH "vlan"
-+
-+struct ebt_vlan_info {
-+	uint16_t id;		/* VLAN ID {1-4095} */
-+	uint8_t prio;		/* VLAN User Priority {0-7} */
-+	uint16_t encap;		/* VLAN Encapsulated frame code {0-65535} */
-+	uint8_t bitmask;		/* Args bitmask bit 1=1 - ID arg,
-+				   bit 2=1 User-Priority arg, bit 3=1 encap*/
-+	uint8_t invflags;		/* Inverse bitmask  bit 1=1 - inversed ID arg, 
-+				   bit 2=1 - inversed Pirority arg */
-+};
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge/ebtables.h linux/include/linux/netfilter_bridge/ebtables.h
---- linux.stock/include/linux/netfilter_bridge/ebtables.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_bridge/ebtables.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,361 @@
-+/*
-+ *  ebtables
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer		<bart.de.schuymer@pandora.be>
-+ *
-+ *  ebtables.c,v 2.0, September, 2002
-+ *
-+ *  This code is stongly inspired on the iptables code which is
-+ *  Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
-+ */
-+
-+#ifndef __LINUX_BRIDGE_EFF_H
-+#define __LINUX_BRIDGE_EFF_H
-+#include <linux/if.h>
-+#include <linux/netfilter_bridge.h>
-+#include <linux/if_ether.h>
-+
-+#define EBT_TABLE_MAXNAMELEN 32
-+#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-+#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-+
-+// verdicts >0 are "branches"
-+#define EBT_ACCEPT   -1
-+#define EBT_DROP     -2
-+#define EBT_CONTINUE -3
-+#define EBT_RETURN   -4
-+#define NUM_STANDARD_TARGETS   4
-+
-+struct ebt_counter
-+{
-+	uint64_t pcnt;
-+	uint64_t bcnt;
-+};
-+
-+struct ebt_entries {
-+	// this field is always set to zero
-+	// See EBT_ENTRY_OR_ENTRIES.
-+	// Must be same size as ebt_entry.bitmask
-+	unsigned int distinguisher;
-+	// the chain name
-+	char name[EBT_CHAIN_MAXNAMELEN];
-+	// counter offset for this chain
-+	unsigned int counter_offset;
-+	// one standard (accept, drop, return) per hook
-+	int policy;
-+	// nr. of entries
-+	unsigned int nentries;
-+	// entry list
-+	char data[0];
-+};
-+
-+// used for the bitmask of struct ebt_entry
-+
-+// This is a hack to make a difference between an ebt_entry struct and an
-+// ebt_entries struct when traversing the entries from start to end.
-+// Using this simplifies the code alot, while still being able to use
-+// ebt_entries.
-+// Contrary, iptables doesn't use something like ebt_entries and therefore uses
-+// different techniques for naming the policy and such. So, iptables doesn't
-+// need a hack like this.
-+#define EBT_ENTRY_OR_ENTRIES 0x01
-+// these are the normal masks
-+#define EBT_NOPROTO 0x02
-+#define EBT_802_3 0x04
-+#define EBT_SOURCEMAC 0x08
-+#define EBT_DESTMAC 0x10
-+#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \
-+   | EBT_ENTRY_OR_ENTRIES)
-+
-+#define EBT_IPROTO 0x01
-+#define EBT_IIN 0x02
-+#define EBT_IOUT 0x04
-+#define EBT_ISOURCE 0x8
-+#define EBT_IDEST 0x10
-+#define EBT_ILOGICALIN 0x20
-+#define EBT_ILOGICALOUT 0x40
-+#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
-+   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
-+
-+struct ebt_entry_match
-+{
-+	union {
-+		char name[EBT_FUNCTION_MAXNAMELEN];
-+		struct ebt_match *match;
-+	} u;
-+	// size of data
-+	unsigned int match_size;
-+	unsigned char data[0];
-+};
-+
-+struct ebt_entry_watcher
-+{
-+	union {
-+		char name[EBT_FUNCTION_MAXNAMELEN];
-+		struct ebt_watcher *watcher;
-+	} u;
-+	// size of data
-+	unsigned int watcher_size;
-+	unsigned char data[0];
-+};
-+
-+struct ebt_entry_target
-+{
-+	union {
-+		char name[EBT_FUNCTION_MAXNAMELEN];
-+		struct ebt_target *target;
-+	} u;
-+	// size of data
-+	unsigned int target_size;
-+	unsigned char data[0];
-+};
-+
-+#define EBT_STANDARD_TARGET "standard"
-+struct ebt_standard_target
-+{
-+	struct ebt_entry_target target;
-+	int verdict;
-+};
-+
-+// one entry
-+struct ebt_entry {
-+	// this needs to be the first field
-+	unsigned int bitmask;
-+	unsigned int invflags;
-+	uint16_t ethproto;
-+	// the physical in-dev
-+	char in[IFNAMSIZ];
-+	// the logical in-dev
-+	char logical_in[IFNAMSIZ];
-+	// the physical out-dev
-+	char out[IFNAMSIZ];
-+	// the logical out-dev
-+	char logical_out[IFNAMSIZ];
-+	unsigned char sourcemac[ETH_ALEN];
-+	unsigned char sourcemsk[ETH_ALEN];
-+	unsigned char destmac[ETH_ALEN];
-+	unsigned char destmsk[ETH_ALEN];
-+	// sizeof ebt_entry + matches
-+	unsigned int watchers_offset;
-+	// sizeof ebt_entry + matches + watchers
-+	unsigned int target_offset;
-+	// sizeof ebt_entry + matches + watchers + target
-+	unsigned int next_offset;
-+	unsigned char elems[0];
-+};
-+
-+struct ebt_replace
-+{
-+	char name[EBT_TABLE_MAXNAMELEN];
-+	unsigned int valid_hooks;
-+	// nr of rules in the table
-+	unsigned int nentries;
-+	// total size of the entries
-+	unsigned int entries_size;
-+	// start of the chains
-+	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
-+	// nr of counters userspace expects back
-+	unsigned int num_counters;
-+	// where the kernel will put the old counters
-+	struct ebt_counter *counters;
-+	char *entries;
-+};
-+
-+// [gs]etsockopt numbers
-+#define EBT_BASE_CTL            128
-+
-+#define EBT_SO_SET_ENTRIES      (EBT_BASE_CTL)
-+#define EBT_SO_SET_COUNTERS     (EBT_SO_SET_ENTRIES+1)
-+#define EBT_SO_SET_MAX          (EBT_SO_SET_COUNTERS+1)
-+
-+#define EBT_SO_GET_INFO         (EBT_BASE_CTL)
-+#define EBT_SO_GET_ENTRIES      (EBT_SO_GET_INFO+1)
-+#define EBT_SO_GET_INIT_INFO    (EBT_SO_GET_ENTRIES+1)
-+#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
-+#define EBT_SO_GET_MAX          (EBT_SO_GET_INIT_ENTRIES+1)
-+
-+#ifdef __KERNEL__
-+
-+// return values for match() functions
-+#define EBT_MATCH 0
-+#define EBT_NOMATCH 1
-+
-+struct ebt_match
-+{
-+	struct list_head list;
-+	const char name[EBT_FUNCTION_MAXNAMELEN];
-+	// 0 == it matches
-+	int (*match)(const struct sk_buff *skb, const struct net_device *in,
-+	   const struct net_device *out, const void *matchdata,
-+	   unsigned int datalen);
-+	// 0 == let it in
-+	int (*check)(const char *tablename, unsigned int hookmask,
-+	   const struct ebt_entry *e, void *matchdata, unsigned int datalen);
-+	void (*destroy)(void *matchdata, unsigned int datalen);
-+	struct module *me;
-+};
-+
-+struct ebt_watcher
-+{
-+	struct list_head list;
-+	const char name[EBT_FUNCTION_MAXNAMELEN];
-+	void (*watcher)(const struct sk_buff *skb, const struct net_device *in,
-+	   const struct net_device *out, const void *watcherdata,
-+	   unsigned int datalen);
-+	// 0 == let it in
-+	int (*check)(const char *tablename, unsigned int hookmask,
-+	   const struct ebt_entry *e, void *watcherdata, unsigned int datalen);
-+	void (*destroy)(void *watcherdata, unsigned int datalen);
-+	struct module *me;
-+};
-+
-+struct ebt_target
-+{
-+	struct list_head list;
-+	const char name[EBT_FUNCTION_MAXNAMELEN];
-+	// returns one of the standard verdicts
-+	int (*target)(struct sk_buff **pskb, unsigned int hooknr,
-+	   const struct net_device *in, const struct net_device *out,
-+	   const void *targetdata, unsigned int datalen);
-+	// 0 == let it in
-+	int (*check)(const char *tablename, unsigned int hookmask,
-+	   const struct ebt_entry *e, void *targetdata, unsigned int datalen);
-+	void (*destroy)(void *targetdata, unsigned int datalen);
-+	struct module *me;
-+};
-+
-+// used for jumping from and into user defined chains (udc)
-+struct ebt_chainstack
-+{
-+	struct ebt_entries *chaininfo; // pointer to chain data
-+	struct ebt_entry *e; // pointer to entry data
-+	unsigned int n; // n'th entry
-+};
-+
-+struct ebt_table_info
-+{
-+	// total size of the entries
-+	unsigned int entries_size;
-+	unsigned int nentries;
-+	// pointers to the start of the chains
-+	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
-+	// room to maintain the stack used for jumping from and into udc
-+	struct ebt_chainstack **chainstack;
-+	char *entries;
-+	struct ebt_counter counters[0] ____cacheline_aligned;
-+};
-+
-+struct ebt_table
-+{
-+	struct list_head list;
-+	char name[EBT_TABLE_MAXNAMELEN];
-+	struct ebt_replace *table;
-+	unsigned int valid_hooks;
-+	rwlock_t lock;
-+	// e.g. could be the table explicitly only allows certain
-+	// matches, targets, ... 0 == let it in
-+	int (*check)(const struct ebt_table_info *info,
-+	   unsigned int valid_hooks);
-+	// the data used by the kernel
-+	struct ebt_table_info *private;
-+};
-+
-+#define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_entry_target)-1)) & \
-+		     ~(__alignof__(struct ebt_entry_target)-1))
-+extern int ebt_register_table(struct ebt_table *table);
-+extern void ebt_unregister_table(struct ebt_table *table);
-+extern int ebt_register_match(struct ebt_match *match);
-+extern void ebt_unregister_match(struct ebt_match *match);
-+extern int ebt_register_watcher(struct ebt_watcher *watcher);
-+extern void ebt_unregister_watcher(struct ebt_watcher *watcher);
-+extern int ebt_register_target(struct ebt_target *target);
-+extern void ebt_unregister_target(struct ebt_target *target);
-+extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   struct ebt_table *table);
-+
-+   // Used in the kernel match() functions
-+#define FWINV(bool,invflg) ((bool) ^ !!(info->invflags & invflg))
-+// True if the hook mask denotes that the rule is in a base chain,
-+// used in the check() functions
-+#define BASE_CHAIN (hookmask & (1 << NF_BR_NUMHOOKS))
-+// Clear the bit in the hook mask that tells if the rule is on a base chain
-+#define CLEAR_BASE_CHAIN_BIT (hookmask &= ~(1 << NF_BR_NUMHOOKS))
-+// True if the target is not a standard target
-+#define INVALID_TARGET (info->target < -NUM_STANDARD_TARGETS || info->target >= 0)
-+
-+#endif /* __KERNEL__ */
-+
-+// blatently stolen from ip_tables.h
-+// fn returns 0 to continue iteration
-+#define EBT_MATCH_ITERATE(e, fn, args...)                   \
-+({                                                          \
-+	unsigned int __i;                                   \
-+	int __ret = 0;                                      \
-+	struct ebt_entry_match *__match;                    \
-+	                                                    \
-+	for (__i = sizeof(struct ebt_entry);                \
-+	     __i < (e)->watchers_offset;                    \
-+	     __i += __match->match_size +                   \
-+	     sizeof(struct ebt_entry_match)) {              \
-+		__match = (void *)(e) + __i;                \
-+		                                            \
-+		__ret = fn(__match , ## args);              \
-+		if (__ret != 0)                             \
-+			break;                              \
-+	}                                                   \
-+	if (__ret == 0) {                                   \
-+		if (__i != (e)->watchers_offset)            \
-+			__ret = -EINVAL;                    \
-+	}                                                   \
-+	__ret;                                              \
-+})
-+
-+#define EBT_WATCHER_ITERATE(e, fn, args...)                 \
-+({                                                          \
-+	unsigned int __i;                                   \
-+	int __ret = 0;                                      \
-+	struct ebt_entry_watcher *__watcher;                \
-+	                                                    \
-+	for (__i = e->watchers_offset;                      \
-+	     __i < (e)->target_offset;                      \
-+	     __i += __watcher->watcher_size +               \
-+	     sizeof(struct ebt_entry_watcher)) {            \
-+		__watcher = (void *)(e) + __i;              \
-+		                                            \
-+		__ret = fn(__watcher , ## args);            \
-+		if (__ret != 0)                             \
-+			break;                              \
-+	}                                                   \
-+	if (__ret == 0) {                                   \
-+		if (__i != (e)->target_offset)              \
-+			__ret = -EINVAL;                    \
-+	}                                                   \
-+	__ret;                                              \
-+})
-+
-+#define EBT_ENTRY_ITERATE(entries, size, fn, args...)       \
-+({                                                          \
-+	unsigned int __i;                                   \
-+	int __ret = 0;                                      \
-+	struct ebt_entry *__entry;                          \
-+	                                                    \
-+	for (__i = 0; __i < (size);) {                      \
-+		__entry = (void *)(entries) + __i;          \
-+		__ret = fn(__entry , ## args);              \
-+		if (__ret != 0)                             \
-+			break;                              \
-+		if (__entry->bitmask != 0)                  \
-+			__i += __entry->next_offset;        \
-+		else                                        \
-+			__i += sizeof(struct ebt_entries);  \
-+	}                                                   \
-+	if (__ret == 0) {                                   \
-+		if (__i != (size))                          \
-+			__ret = -EINVAL;                    \
-+	}                                                   \
-+	__ret;                                              \
-+})
-+
-+#endif
-diff -Nurb linux.stock/include/linux/netfilter_bridge.h linux/include/linux/netfilter_bridge.h
---- linux.stock/include/linux/netfilter_bridge.h	2003-07-04 04:12:26.000000000 -0400
-+++ linux/include/linux/netfilter_bridge.h	2004-07-10 23:46:39.000000000 -0400
-@@ -6,6 +6,10 @@
- 
- #include <linux/config.h>
- #include <linux/netfilter.h>
-+#if defined(__KERNEL__) && defined(CONFIG_NETFILTER)
-+#include <asm/atomic.h>
-+#include <linux/if_ether.h>
-+#endif
- 
- /* Bridge Hooks */
- /* After promisc drops, checksum checks. */
-@@ -18,7 +22,76 @@
- #define NF_BR_LOCAL_OUT		3
- /* Packets about to hit the wire. */
- #define NF_BR_POST_ROUTING	4
--#define NF_BR_NUMHOOKS		5
-+/* Not really a hook, but used for the ebtables broute table */
-+#define NF_BR_BROUTING		5
-+#define NF_BR_NUMHOOKS		6
-+
-+#ifdef __KERNEL__
-+
-+#define BRNF_PKT_TYPE			0x01
-+#define BRNF_BRIDGED_DNAT		0x02
-+#define BRNF_DONT_TAKE_PARENT		0x04
-+#define BRNF_BRIDGED			0x08
-+#define BRNF_NF_BRIDGE_PREROUTING	0x10
-+
-+enum nf_br_hook_priorities {
-+	NF_BR_PRI_FIRST = INT_MIN,
-+	NF_BR_PRI_NAT_DST_BRIDGED = -300,
-+	NF_BR_PRI_FILTER_BRIDGED = -200,
-+	NF_BR_PRI_BRNF = 0,
-+	NF_BR_PRI_NAT_DST_OTHER = 100,
-+	NF_BR_PRI_FILTER_OTHER = 200,
-+	NF_BR_PRI_NAT_SRC = 300,
-+	NF_BR_PRI_LAST = INT_MAX,
-+};
-+
-+#ifdef CONFIG_NETFILTER
-+static inline
-+struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
-+{
-+	struct nf_bridge_info **nf_bridge = &(skb->nf_bridge);
-+
-+	if ((*nf_bridge = kmalloc(sizeof(**nf_bridge), GFP_ATOMIC)) != NULL) {
-+		atomic_set(&(*nf_bridge)->use, 1);
-+		(*nf_bridge)->mask = 0;
-+		(*nf_bridge)->physindev = (*nf_bridge)->physoutdev = NULL;
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+		(*nf_bridge)->netoutdev = NULL;
-+#endif
-+	}
-+
-+	return *nf_bridge;
-+}
-+
-+/* Only used in br_forward.c */
-+static inline
-+void nf_bridge_maybe_copy_header(struct sk_buff *skb)
-+{
-+	if (skb->nf_bridge) {
-+		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+			memcpy(skb->data - 18, skb->nf_bridge->data, 18);
-+			skb_push(skb, 4);
-+		} else
-+			memcpy(skb->data - 16, skb->nf_bridge->data, 16);
-+	}
-+}
-+
-+static inline
-+void nf_bridge_save_header(struct sk_buff *skb)
-+{
-+        int header_size = 16;
-+
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q))
-+		header_size = 18;
-+	memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
-+}
+--- linux-2.4.21/net/core/dev.c	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/net/core/dev.c	Fri Aug  8 01:10:03 2003
+@@ -1424,7 +1424,7 @@ static void net_tx_action(struct softirq
  
-+struct bridge_skb_cb {
-+	union {
-+		__u32 ipv4;
-+	} daddr;
-+};
-+#endif /* CONFIG_NETFILTER */
  
-+#endif /* __KERNEL__ */
- #endif
-diff -Nurb linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h linux/include/linux/netfilter_ipv4/ipt_physdev.h
---- linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux/include/linux/netfilter_ipv4/ipt_physdev.h	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,24 @@
-+#ifndef _IPT_PHYSDEV_H
-+#define _IPT_PHYSDEV_H
-+
-+#ifdef __KERNEL__
-+#include <linux/if.h>
-+#endif
-+
-+#define IPT_PHYSDEV_OP_IN		0x01
-+#define IPT_PHYSDEV_OP_OUT		0x02
-+#define IPT_PHYSDEV_OP_BRIDGED		0x04
-+#define IPT_PHYSDEV_OP_ISIN		0x08
-+#define IPT_PHYSDEV_OP_ISOUT		0x10
-+#define IPT_PHYSDEV_OP_MASK		(0x20 - 1)
-+
-+struct ipt_physdev_info {
-+	char physindev[IFNAMSIZ];
-+	char in_mask[IFNAMSIZ];
-+	char physoutdev[IFNAMSIZ];
-+	char out_mask[IFNAMSIZ];
-+	u_int8_t invert;
-+	u_int8_t bitmask;
-+};
-+
-+#endif /*_IPT_PHYSDEV_H*/
-diff -Nurb linux.stock/include/linux/netfilter_ipv4.h linux/include/linux/netfilter_ipv4.h
---- linux.stock/include/linux/netfilter_ipv4.h	2004-07-10 23:30:09.000000000 -0400
-+++ linux/include/linux/netfilter_ipv4.h	2004-07-10 23:46:39.000000000 -0400
-@@ -54,8 +54,10 @@
- 	NF_IP_PRI_CONNTRACK_DEFRAG = -400,
- 	NF_IP_PRI_RAW = -300,
- 	NF_IP_PRI_CONNTRACK = -200,
-+	NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD = -175,
- 	NF_IP_PRI_MANGLE = -150,
- 	NF_IP_PRI_NAT_DST = -100,
-+	NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50,
- 	NF_IP_PRI_FILTER = 0,
- 	NF_IP_PRI_NAT_SRC = 100,
- 	NF_IP_PRI_LAST = INT_MAX,
-diff -Nurb linux.stock/include/linux/skbuff.h linux/include/linux/skbuff.h
---- linux.stock/include/linux/skbuff.h	2003-07-04 04:12:26.000000000 -0400
-+++ linux/include/linux/skbuff.h	2004-07-10 23:46:39.000000000 -0400
-@@ -92,6 +92,20 @@
- struct nf_ct_info {
- 	struct nf_conntrack *master;
- };
-+
-+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
-+struct nf_bridge_info {
-+	atomic_t use;
-+	struct net_device *physindev;
-+	struct net_device *physoutdev;
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+	struct net_device *netoutdev;
-+#endif
-+	unsigned int mask;
-+	unsigned long data[32 / sizeof(unsigned long)];
-+};
-+#endif
-+
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+-void (*br_handle_frame_hook)(struct sk_buff *skb) = NULL;
++int (*br_handle_frame_hook)(struct sk_buff *skb) = NULL;
  #endif
  
- struct sk_buff_head {
-@@ -204,6 +218,9 @@
- #ifdef CONFIG_NETFILTER_DEBUG
-         unsigned int nf_debug;
- #endif
-+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
-+	struct nf_bridge_info	*nf_bridge;	/* Saved data about a bridged frame - see br_netfilter.c */
-+#endif
- #endif /*CONFIG_NETFILTER*/
+ static __inline__ int handle_bridge(struct sk_buff *skb,
+@@ -1441,7 +1441,6 @@ static __inline__ int handle_bridge(stru
+ 		}
+ 	}
  
- #if defined(CONFIG_HIPPI)
-@@ -1143,6 +1160,20 @@
- 	if (nfct)
- 		atomic_inc(&nfct->master->use);
+-	br_handle_frame_hook(skb);
+ 	return ret;
  }
+ 
+@@ -1497,11 +1496,16 @@ int netif_receive_skb(struct sk_buff *sk
+ 	if (skb->dev->divert && skb->dev->divert->divert)
+ 		ret = handle_diverter(skb);
+ #endif /* CONFIG_NET_DIVERT */
+-			
 +
-+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
-+static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge)
-+{
-+	if (nf_bridge && atomic_dec_and_test(&nf_bridge->use))
-+		kfree(nf_bridge);
-+}
-+static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge)
-+{
-+	if (nf_bridge)
-+		atomic_inc(&nf_bridge->use);
-+}
-+#endif
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ 	if (skb->dev->br_port != NULL &&
+-	    br_handle_frame_hook != NULL) {
+-		return handle_bridge(skb, pt_prev);
++        br_handle_frame_hook != NULL) {
++		int ret;
 +
++		ret = handle_bridge(skb, pt_prev);
++		if (br_handle_frame_hook(skb) == 0)
++			return ret;
++		pt_prev = NULL;
+ 	}
  #endif
  
- #endif	/* __KERNEL__ */
-diff -Nurb linux.stock/include/linux/sysctl.h linux/include/linux/sysctl.h
---- linux.stock/include/linux/sysctl.h	2004-07-10 23:29:55.000000000 -0400
-+++ linux/include/linux/sysctl.h	2004-07-10 23:46:39.000000000 -0400
-@@ -547,6 +547,15 @@
- 	NET_DECNET_CONF_DEV_STATE = 7
- };
- 
-+/* /proc/sys/net/bridge */
-+enum {
-+	NET_BRIDGE_NF_CALL_ARPTABLES = 1,
-+	NET_BRIDGE_NF_CALL_IPTABLES = 2,
-+	NET_BRIDGE_NF_CALL_IP6TABLES = 3,
-+	NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
-+};
-+
+@@ -1897,7 +1901,7 @@ static int dev_proc_stats(char *buffer, 
+  *	are adjusted, %RTM_NEWLINK is sent to the routing socket and the
+  *	function returns zero.
+  */
+- 
 +
- /* CTL_PROC names: */
+ int netdev_set_master(struct net_device *slave, struct net_device *master)
+ {
+ 	struct net_device *old = slave->master;
+--- linux-2.4.21/net/bridge/br_input.c	Sat Aug  3 02:39:46 2002
++++ linux-2.4.21-ebt-brnf-3/net/bridge/br_input.c	Fri Aug  8 01:09:06 2003
+@@ -24,6 +24,9 @@ unsigned char bridge_ula[6] = { 0x01, 0x
  
- /* CTL_FS names: */
-diff -Nurb linux.stock/net/8021q/vlan_dev.c linux/net/8021q/vlan_dev.c
---- linux.stock/net/8021q/vlan_dev.c	2003-07-04 04:12:29.000000000 -0400
-+++ linux/net/8021q/vlan_dev.c	2004-07-10 23:46:39.000000000 -0400
-@@ -503,6 +503,10 @@
- 	stats->tx_packets++; /* for statics only */
- 	stats->tx_bytes += skb->len;
+ static int br_pass_frame_up_finish(struct sk_buff *skb)
+ {
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug = 0;
++#endif
+ 	netif_rx(skb);
  
-+	skb->protocol = __constant_htons(ETH_P_8021Q);
-+	skb->mac.raw -= VLAN_HLEN;
-+	skb->nh.raw -= VLAN_HLEN;
-+
- 	dev_queue_xmit(skb);
+ 	return 0;
+@@ -46,7 +49,7 @@ static void br_pass_frame_up(struct net_
+ 			br_pass_frame_up_finish);
+ }
  
+-static int br_handle_frame_finish(struct sk_buff *skb)
++int br_handle_frame_finish(struct sk_buff *skb)
+ {
+ 	struct net_bridge *br;
+ 	unsigned char *dest;
+@@ -112,7 +115,7 @@ err_nolock:
  	return 0;
-diff -Nurb linux.stock/net/Config.in linux/net/Config.in
---- linux.stock/net/Config.in	2004-07-10 23:29:49.000000000 -0400
-+++ linux/net/Config.in	2004-07-10 23:46:39.000000000 -0400
-@@ -68,6 +68,9 @@
-    source net/decnet/Config.in
- fi
- dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET
-+if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then
-+   source net/bridge/netfilter/Config.in
-+fi
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
-    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
-diff -Nurb linux.stock/net/Makefile linux/net/Makefile
---- linux.stock/net/Makefile	2004-07-10 23:29:49.000000000 -0400
-+++ linux/net/Makefile	2004-07-10 23:49:10.000000000 -0400
-@@ -26,6 +26,12 @@
- endif
- endif
+ }
  
-+ifneq ($(CONFIG_BRIDGE),n)
-+ifneq ($(CONFIG_BRIDGE),)
-+subdir-$(CONFIG_BRIDGE)		+= bridge/netfilter
-+endif
-+endif
-+
- subdir-$(CONFIG_KHTTPD)		+= khttpd
- subdir-$(CONFIG_PACKET)		+= packet
- subdir-$(CONFIG_NET_SCHED)	+= sched
-diff -Nurb linux.stock/net/bridge/Makefile linux/net/bridge/Makefile
---- linux.stock/net/bridge/Makefile	2003-07-04 04:12:30.000000000 -0400
-+++ linux/net/bridge/Makefile	2004-07-10 23:46:39.000000000 -0400
-@@ -7,10 +7,17 @@
- #
- # Note 2! The CFLAGS definition is now in the main makefile...
+-void br_handle_frame(struct sk_buff *skb)
++int br_handle_frame(struct sk_buff *skb)
+ {
+ 	struct net_bridge *br;
+ 	unsigned char *dest;
+@@ -146,25 +149,35 @@ void br_handle_frame(struct sk_buff *skb
+ 		goto handle_special_frame;
  
-+export-objs := br.o
-+
- O_TARGET	:= bridge.o
- obj-y		:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
- 			br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
- 			br_stp_if.o br_stp_timer.o
+ 	if (p->state == BR_STATE_FORWARDING) {
 +
-+ifeq ($(CONFIG_NETFILTER),y)
-+obj-y		+= br_netfilter.o
-+endif
++		if (br_should_route_hook && br_should_route_hook(&skb)) {
++			read_unlock(&br->lock);
++			return -1;
++		}
 +
- obj-m		:= $(O_TARGET)
- 
- include $(TOPDIR)/Rules.make
-diff -Nurb linux.stock/net/bridge/br.c linux/net/bridge/br.c
---- linux.stock/net/bridge/br.c	2003-10-14 04:09:32.000000000 -0400
-+++ linux/net/bridge/br.c	2004-07-10 23:46:39.000000000 -0400
-@@ -29,6 +29,8 @@
- #include "../atm/lec.h"
- #endif
- 
-+int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
++		if (!memcmp(p->br->dev.dev_addr, dest, ETH_ALEN))
++			skb->pkt_type = PACKET_HOST;
 +
- void br_dec_use_count()
- {
- 	MOD_DEC_USE_COUNT;
-@@ -43,6 +45,10 @@
- {
- 	printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n");
+ 		NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		read_unlock(&br->lock);
+-		return;
++		return 0;
+ 	}
  
-+#ifdef CONFIG_NETFILTER
-+	if (br_netfilter_init())
-+		return 1;
-+#endif
- 	br_handle_frame_hook = br_handle_frame;
- 	br_ioctl_hook = br_ioctl_deviceless_stub;
- #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
-@@ -61,6 +67,9 @@
+ err:
+ 	read_unlock(&br->lock);
+ err_nolock:
+ 	kfree_skb(skb);
+-	return;
++	return 0;
  
- static void __exit br_deinit(void)
- {
-+#ifdef CONFIG_NETFILTER
-+	br_netfilter_fini();
-+#endif
- 	unregister_netdevice_notifier(&br_device_notifier);
- 	br_call_ioctl_atomic(__br_clear_ioctl_hook);
+ handle_special_frame:
+ 	if (!dest[5]) {
+ 		br_stp_handle_bpdu(skb);
+ 		read_unlock(&br->lock);
+-		return;
++		return 0;
+ 	}
  
-@@ -74,7 +83,7 @@
- #endif
+ 	read_unlock(&br->lock);
+ 	kfree_skb(skb);
++	return 0;
  }
- 
--EXPORT_NO_SYMBOLS;
-+EXPORT_SYMBOL(br_should_route_hook);
- 
- module_init(br_init)
- module_exit(br_deinit)
-diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
---- linux.stock/net/bridge/br_forward.c	2003-10-14 04:09:32.000000000 -0400
-+++ linux/net/bridge/br_forward.c	2004-07-10 23:46:39.000000000 -0400
-@@ -30,18 +30,21 @@
+--- linux-2.4.21/net/bridge/br_forward.c	Sat Aug  3 02:39:46 2002
++++ linux-2.4.21-ebt-brnf-3/net/bridge/br_forward.c	Fri Aug  8 01:09:06 2003
+@@ -30,18 +30,22 @@ static inline int should_deliver(struct 
  	return 1;
  }
  
@@ -1166,7 +171,8 @@ diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
 +int br_dev_queue_push_xmit(struct sk_buff *skb)
  {
 +#ifdef CONFIG_NETFILTER
-+	nf_bridge_maybe_copy_header(skb);
++	if (skb->nf_bridge)
++		memcpy(skb->data - 16, skb->nf_bridge->hh, 16);
 +#endif
  	skb_push(skb, ETH_HLEN);
  	dev_queue_xmit(skb);
@@ -1183,7 +189,7 @@ diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
  
  	return 0;
  }
-@@ -49,8 +52,11 @@
+@@ -49,8 +53,11 @@ static int __br_forward_finish(struct sk
  static void __br_deliver(struct net_bridge_port *to, struct sk_buff *skb)
  {
  	skb->dev = to->dev;
@@ -1196,7 +202,7 @@ diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
  }
  
  static void __br_forward(struct net_bridge_port *to, struct sk_buff *skb)
-@@ -61,7 +67,7 @@
+@@ -61,7 +68,7 @@ static void __br_forward(struct net_brid
  	skb->dev = to->dev;
  
  	NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
@@ -1205,1040 +211,176 @@ diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
  }
  
  /* called under bridge lock */
-diff -Nurb linux.stock/net/bridge/br_input.c linux/net/bridge/br_input.c
---- linux.stock/net/bridge/br_input.c	2003-10-14 04:09:32.000000000 -0400
-+++ linux/net/bridge/br_input.c	2004-07-10 23:48:36.000000000 -0400
-@@ -24,6 +24,9 @@
+--- linux-2.4.21/net/bridge/br.c	Fri Nov 29 00:53:15 2002
++++ linux-2.4.21-ebt-brnf-3/net/bridge/br.c	Fri Aug  8 01:09:06 2003
+@@ -29,6 +29,8 @@
+ #include "../atm/lec.h"
+ #endif
  
- static int br_pass_frame_up_finish(struct sk_buff *skb)
++int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
++
+ void br_dec_use_count()
  {
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug = 0;
-+#endif
- 	netif_rx(skb);
- 
- 	return 0;
-@@ -46,7 +49,7 @@
- 			br_pass_frame_up_finish);
- }
- 
--static int br_handle_frame_finish(struct sk_buff *skb)
-+int br_handle_frame_finish(struct sk_buff *skb)
+ 	MOD_DEC_USE_COUNT;
+@@ -43,6 +45,10 @@ static int __init br_init(void)
  {
- 	struct net_bridge *br;
- 	unsigned char *dest;
-@@ -112,7 +115,7 @@
- 	return 0;
- }
+ 	printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n");
  
--void br_handle_frame(struct sk_buff *skb)
-+int br_handle_frame(struct sk_buff *skb)
++#ifdef CONFIG_NETFILTER
++	if (br_netfilter_init())
++		return 1;
++#endif
+ 	br_handle_frame_hook = br_handle_frame;
+ 	br_ioctl_hook = br_ioctl_deviceless_stub;
+ #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+@@ -61,6 +67,9 @@ static void __br_clear_ioctl_hook(void)
+ 
+ static void __exit br_deinit(void)
  {
- 	struct net_bridge *br;
- 	unsigned char *dest;
-@@ -146,25 +149,34 @@
- 		goto handle_special_frame;
++#ifdef CONFIG_NETFILTER
++	br_netfilter_fini();
++#endif
+ 	unregister_netdevice_notifier(&br_device_notifier);
+ 	br_call_ioctl_atomic(__br_clear_ioctl_hook);
  
- 	if (p->state == BR_STATE_FORWARDING) {
-+ 		if (br_should_route_hook && br_should_route_hook(&skb)) {
-+ 			read_unlock(&br->lock);
-+ 			return -1;
-+ 		}
-+ 
-+ 		if (!memcmp(p->br->dev.dev_addr, dest, ETH_ALEN))
-+ 			skb->pkt_type = PACKET_HOST;
-+ 
- 		NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
- 			br_handle_frame_finish);
- 		read_unlock(&br->lock);
--		return;
-+		return 0;
- 	}
+@@ -74,7 +83,7 @@ static void __exit br_deinit(void)
+ #endif
+ }
  
- err:
- 	read_unlock(&br->lock);
- err_nolock:
- 	kfree_skb(skb);
--	return;
-+	return 0;
+-EXPORT_NO_SYMBOLS;
++EXPORT_SYMBOL(br_should_route_hook);
  
- handle_special_frame:
- 	if (!dest[5]) {
- 		br_stp_handle_bpdu(skb);
- 		read_unlock(&br->lock);
--		return;
-+		return 0;
- 	}
+ module_init(br_init)
+ module_exit(br_deinit)
+--- linux-2.4.21/net/bridge/Makefile	Fri Dec 29 23:07:24 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/Makefile	Fri Aug  8 01:09:06 2003
+@@ -7,10 +7,17 @@
+ #
+ # Note 2! The CFLAGS definition is now in the main makefile...
  
- 	read_unlock(&br->lock);
- 	kfree_skb(skb);
-+	return 0;
- }
-diff -Nurb linux.stock/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
---- linux.stock/net/bridge/br_netfilter.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/br_netfilter.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,896 @@
-+/*
-+ *	Handle firewalling
-+ *	Linux ethernet bridge
-+ *
-+ *	Authors:
-+ *	Lennert Buytenhek               <buytenh@gnu.org>
-+ *	Bart De Schuymer (maintainer)	<bdschuym@pandora.be>
-+ *
-+ *	Changes:
-+ *	Apr 29 2003: physdev module support (bdschuym)
-+ *	Jun 19 2003: let arptables see bridged ARP traffic (bdschuym)
-+ *	Oct 06 2003: filter encapsulated IP/ARP VLAN traffic on untagged bridge
-+ *	             (bdschuym)
-+ *
-+ *	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.
-+ *
-+ *	Lennert dedicates this file to Kerstin Wurdinger.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/ip.h>
-+#include <linux/netdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_vlan.h>
-+#include <linux/netfilter_bridge.h>
-+#include <linux/netfilter_ipv4.h>
-+#include <linux/in_route.h>
-+#include <net/ip.h>
-+#include <asm/uaccess.h>
-+#include <asm/checksum.h>
-+#include "br_private.h"
-+#ifdef CONFIG_SYSCTL
-+#include <linux/sysctl.h>
-+#endif
-+
++export-objs := br.o
 +
-+#define skb_origaddr(skb)	 (((struct bridge_skb_cb *) \
-+				 (skb->nf_bridge->data))->daddr.ipv4)
-+#define store_orig_dstaddr(skb)	 (skb_origaddr(skb) = (skb)->nh.iph->daddr)
-+#define dnat_took_place(skb)	 (skb_origaddr(skb) != (skb)->nh.iph->daddr)
+ O_TARGET	:= bridge.o
+ obj-y		:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
+ 			br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
+ 			br_stp_if.o br_stp_timer.o
 +
-+#define has_bridge_parent(device)	((device)->br_port != NULL)
-+#define bridge_parent(device)		(&((device)->br_port->br->dev))
++ifeq ($(CONFIG_NETFILTER),y)
++obj-y		+= br_netfilter.o
++endif
 +
-+#ifdef CONFIG_SYSCTL
-+static struct ctl_table_header *brnf_sysctl_header;
-+static int brnf_call_iptables = 1;
-+static int brnf_call_arptables = 1;
-+static int brnf_filter_vlan_tagged = 1;
-+#else
-+#define brnf_filter_vlan_tagged 1
+ obj-m		:= $(O_TARGET)
+ 
+ include $(TOPDIR)/Rules.make
+--- linux-2.4.21/include/linux/netfilter_bridge.h	Tue Jun 12 04:15:27 2001
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge.h	Fri Aug  8 01:09:06 2003
+@@ -1,11 +1,14 @@
+ #ifndef __LINUX_BRIDGE_NETFILTER_H
+ #define __LINUX_BRIDGE_NETFILTER_H
+ 
+-/* bridge-specific defines for netfilter. 
++/* bridge-specific defines for netfilter.
+  */
+ 
+ #include <linux/config.h>
+ #include <linux/netfilter.h>
++#if defined(__KERNEL__) && defined(CONFIG_NETFILTER)
++#include <asm/atomic.h>
 +#endif
+ 
+ /* Bridge Hooks */
+ /* After promisc drops, checksum checks. */
+@@ -18,7 +21,49 @@
+ #define NF_BR_LOCAL_OUT		3
+ /* Packets about to hit the wire. */
+ #define NF_BR_POST_ROUTING	4
+-#define NF_BR_NUMHOOKS		5
++/* Not really a hook, but used for the ebtables broute table */
++#define NF_BR_BROUTING		5
++#define NF_BR_NUMHOOKS		6
+ 
++#ifdef __KERNEL__
+ 
++#define BRNF_PKT_TYPE			0x01
++#define BRNF_BRIDGED_DNAT		0x02
++#define BRNF_DONT_TAKE_PARENT		0x04
++#define BRNF_BRIDGED			0x08
 +
-+#define IS_VLAN_IP (skb->protocol == __constant_htons(ETH_P_8021Q) &&    \
-+	hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_IP) &&  \
-+	brnf_filter_vlan_tagged)
-+/*
-+#define IS_VLAN_ARP (skb->protocol == __constant_htons(ETH_P_8021Q) &&   \
-+	hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_ARP) && \
-+	brnf_filter_vlan_tagged)
-+*/
-+
-+/* We need these fake structures to make netfilter happy --
-+ * lots of places assume that skb->dst != NULL, which isn't
-+ * all that unreasonable.
-+ *
-+ * Currently, we fill in the PMTU entry because netfilter
-+ * refragmentation needs it, and the rt_flags entry because
-+ * ipt_REJECT needs it.  Future netfilter modules might
-+ * require us to fill additional fields.
-+ */
-+static struct net_device __fake_net_device = {
-+	.hard_header_len	= ETH_HLEN
-+};
-+
-+static struct rtable __fake_rtable = {
-+	u: {
-+		dst: {
-+			__refcnt:		ATOMIC_INIT(1),
-+			dev:			&__fake_net_device,
-+			pmtu:			1500
-+		}
-+	},
-+
-+	rt_flags:	0
++enum nf_br_hook_priorities {
++	NF_BR_PRI_FIRST = INT_MIN,
++	NF_BR_PRI_NAT_DST_BRIDGED = -300,
++	NF_BR_PRI_FILTER_BRIDGED = -200,
++	NF_BR_PRI_BRNF = 0,
++	NF_BR_PRI_NAT_DST_OTHER = 100,
++	NF_BR_PRI_FILTER_OTHER = 200,
++	NF_BR_PRI_NAT_SRC = 300,
++	NF_BR_PRI_LAST = INT_MAX,
 +};
 +
-+
-+/* PF_BRIDGE/PRE_ROUTING *********************************************/
-+static void __br_dnat_complain(void)
-+{
-+	static unsigned long last_complaint;
-+
-+	if (jiffies - last_complaint >= 5 * HZ) {
-+		printk(KERN_WARNING "Performing cross-bridge DNAT requires IP "
-+			"forwarding to be enabled\n");
-+		last_complaint = jiffies;
-+	}
-+}
-+
-+
-+/* This requires some explaining. If DNAT has taken place,
-+ * we will need to fix up the destination Ethernet address,
-+ * and this is a tricky process.
-+ *
-+ * There are two cases to consider:
-+ * 1. The packet was DNAT'ed to a device in the same bridge
-+ *    port group as it was received on. We can still bridge
-+ *    the packet.
-+ * 2. The packet was DNAT'ed to a different device, either
-+ *    a non-bridged device or another bridge port group.
-+ *    The packet will need to be routed.
-+ *
-+ * The correct way of distinguishing between these two cases is to
-+ * call ip_route_input() and to look at skb->dst->dev, which is
-+ * changed to the destination device if ip_route_input() succeeds.
-+ *
-+ * Let us first consider the case that ip_route_input() succeeds:
-+ *
-+ * If skb->dst->dev equals the logical bridge device the packet
-+ * came in on, we can consider this bridging. We then call
-+ * skb->dst->output() which will make the packet enter br_nf_local_out()
-+ * not much later. In that function it is assured that the iptables
-+ * FORWARD chain is traversed for the packet.
-+ *
-+ * Otherwise, the packet is considered to be routed and we just
-+ * change the destination MAC address so that the packet will
-+ * later be passed up to the IP stack to be routed.
-+ *
-+ * Let us now consider the case that ip_route_input() fails:
-+ *
-+ * After a "echo '0' > /proc/sys/net/ipv4/ip_forward" ip_route_input()
-+ * will fail, while __ip_route_output_key() will return success. The source
-+ * address for __ip_route_output_key() is set to zero, so __ip_route_output_key
-+ * thinks we're handling a locally generated packet and won't care
-+ * if IP forwarding is allowed. We send a warning message to the users's
-+ * log telling her to put IP forwarding on.
-+ *
-+ * ip_route_input() will also fail if there is no route available.
-+ * In that case we just drop the packet.
-+ *
-+ * --Lennert, 20020411
-+ * --Bart, 20020416 (updated)
-+ * --Bart, 20021007 (updated)
-+ */
-+
-+static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
-+{
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug |= (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_FORWARD);
-+#endif
-+
-+	if (skb->pkt_type == PACKET_OTHERHOST) {
-+		skb->pkt_type = PACKET_HOST;
-+		skb->nf_bridge->mask |= BRNF_PKT_TYPE;
-+	}
-+	skb->nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
-+
-+	skb->dev = bridge_parent(skb->dev);
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+		skb_pull(skb, VLAN_HLEN);
-+		skb->nh.raw += VLAN_HLEN;
-+	}
-+	skb->dst->output(skb);
-+	return 0;
-+}
-+
-+static int br_nf_pre_routing_finish(struct sk_buff *skb)
-+{
-+	struct net_device *dev = skb->dev;
-+	struct iphdr *iph = skb->nh.iph;
-+	struct nf_bridge_info *nf_bridge = skb->nf_bridge;
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING);
-+#endif
-+
-+	if (nf_bridge->mask & BRNF_PKT_TYPE) {
-+		skb->pkt_type = PACKET_OTHERHOST;
-+		nf_bridge->mask ^= BRNF_PKT_TYPE;
-+	}
-+	nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
-+
-+	if (dnat_took_place(skb)) {
-+		if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
-+		    dev)) {
-+			struct rtable *rt;
-+
-+			if (!ip_route_output(&rt, iph->daddr, 0, iph->tos, 0)) {
-+				/* Bridged-and-DNAT'ed traffic doesn't
-+				 * require ip_forwarding.
-+				 */
-+				if (((struct dst_entry *)rt)->dev == dev) {
-+					skb->dst = (struct dst_entry *)rt;
-+					goto bridged_dnat;
-+				}
-+				__br_dnat_complain();
-+				dst_release((struct dst_entry *)rt);
-+			}
-+			kfree_skb(skb);
-+			return 0;
-+		} else {
-+			if (skb->dst->dev == dev) {
-+bridged_dnat:
-+				/* Tell br_nf_local_out this is a
-+				 * bridged frame
-+				 */
-+				nf_bridge->mask |= BRNF_BRIDGED_DNAT;
-+				skb->dev = nf_bridge->physindev;
-+				if (skb->protocol ==
-+				    __constant_htons(ETH_P_8021Q)) {
-+					skb_push(skb, VLAN_HLEN);
-+					skb->nh.raw -= VLAN_HLEN;
-+				}
-+				NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING,
-+					       skb, skb->dev, NULL,
-+					       br_nf_pre_routing_finish_bridge,
-+					       1);
-+				return 0;
-+			}
-+			memcpy(skb->mac.ethernet->h_dest, dev->dev_addr,
-+			       ETH_ALEN);
-+			skb->pkt_type = PACKET_HOST;
-+		}
-+	} else {
-+		skb->dst = (struct dst_entry *)&__fake_rtable;
-+		dst_hold(skb->dst);
-+	}
-+
-+	skb->dev = nf_bridge->physindev;
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+		skb_push(skb, VLAN_HLEN);
-+		skb->nh.raw -= VLAN_HLEN;
-+	}
-+	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
-+		       br_handle_frame_finish, 1);
-+
-+	return 0;
-+}
-+
-+/* Replicate the checks that IPv4 does on packet reception.
-+ * Set skb->dev to the bridge device (i.e. parent of the
-+ * receiving device) to make netfilter happy, the REDIRECT
-+ * target in particular.  Save the original destination IP
-+ * address to be able to detect DNAT afterwards.
-+ */
-+static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	struct iphdr *iph;
-+	__u32 len;
-+	struct sk_buff *skb = *pskb;
-+	struct nf_bridge_info *nf_bridge;
-+
-+#ifdef CONFIG_SYSCTL
-+	if (!brnf_call_iptables)
-+		return NF_ACCEPT;
-+#endif
-+
-+	if (skb->protocol != __constant_htons(ETH_P_IP)) {
-+		struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)
-+					  ((*pskb)->mac.ethernet);
-+
-+		if (!IS_VLAN_IP)
-+			return NF_ACCEPT;
-+		if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
-+			goto out;
-+		skb_pull(*pskb, VLAN_HLEN);
-+		(*pskb)->nh.raw += VLAN_HLEN;
-+	} else if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
-+		goto out;
-+
-+	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-+		goto inhdr_error;
-+
-+	iph = skb->nh.iph;
-+	if (iph->ihl < 5 || iph->version != 4)
-+		goto inhdr_error;
-+
-+	if (!pskb_may_pull(skb, 4*iph->ihl))
-+		goto inhdr_error;
-+
-+	iph = skb->nh.iph;
-+	if (ip_fast_csum((__u8 *)iph, iph->ihl) != 0)
-+		goto inhdr_error;
-+
-+	len = ntohs(iph->tot_len);
-+	if (skb->len < len || len < 4*iph->ihl)
-+		goto inhdr_error;
-+
-+	if (skb->len > len) {
-+		__pskb_trim(skb, len);
-+		if (skb->ip_summed == CHECKSUM_HW)
-+			skb->ip_summed = CHECKSUM_NONE;
-+	}
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug ^= (1 << NF_IP_PRE_ROUTING);
-+#endif
-+ 	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
-+		return NF_DROP;
-+
-+	if (skb->pkt_type == PACKET_OTHERHOST) {
-+		skb->pkt_type = PACKET_HOST;
-+		nf_bridge->mask |= BRNF_PKT_TYPE;
-+	}
-+
-+	nf_bridge->mask |= BRNF_NF_BRIDGE_PREROUTING;
-+	nf_bridge->physindev = skb->dev;
-+	skb->dev = bridge_parent(skb->dev);
-+	store_orig_dstaddr(skb);
-+
-+	NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL,
-+		br_nf_pre_routing_finish);
-+
-+	return NF_STOLEN;
-+
-+inhdr_error:
-+//	IP_INC_STATS_BH(IpInHdrErrors);
-+out:
-+	return NF_DROP;
-+}
-+
-+
-+/* PF_BRIDGE/LOCAL_IN ************************************************/
-+/* The packet is locally destined, which requires a real
-+ * dst_entry, so detach the fake one.  On the way up, the
-+ * packet would pass through PRE_ROUTING again (which already
-+ * took place when the packet entered the bridge), but we
-+ * register an IPv4 PRE_ROUTING 'sabotage' hook that will
-+ * prevent this from happening.
-+ */
-+static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	struct sk_buff *skb = *pskb;
-+
-+	if (skb->dst == (struct dst_entry *)&__fake_rtable) {
-+		dst_release(skb->dst);
-+		skb->dst = NULL;
-+	}
-+
-+	return NF_ACCEPT;
-+}
-+
-+/* PF_BRIDGE/FORWARD *************************************************/
-+static int br_nf_forward_finish(struct sk_buff *skb)
-+{
-+	struct nf_bridge_info *nf_bridge = skb->nf_bridge;
-+	struct net_device *in;
-+	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug ^= (1 << NF_BR_FORWARD);
-+#endif
-+
-+	if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP) {
-+		in = nf_bridge->physindev;
-+		if (nf_bridge->mask & BRNF_PKT_TYPE) {
-+			skb->pkt_type = PACKET_OTHERHOST;
-+			nf_bridge->mask ^= BRNF_PKT_TYPE;
-+		}
-+	} else {
-+		in = *((struct net_device **)(skb->cb));
-+	}
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+		skb_push(skb, VLAN_HLEN);
-+		skb->nh.raw -= VLAN_HLEN;
-+	}
-+	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in,
-+			skb->dev, br_forward_finish, 1);
-+	return 0;
-+}
-+
-+/* This is the 'purely bridged' case.  For IP, we pass the packet to
-+ * netfilter with indev and outdev set to the bridge device,
-+ * but we are still able to filter on the 'real' indev/outdev
-+ * because of the ipt_physdev.c module. For ARP, indev and outdev are the
-+ * bridge ports.
-+ */
-+static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	struct sk_buff *skb = *pskb;
-+	struct nf_bridge_info *nf_bridge;
-+	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);
-+
-+#ifdef CONFIG_SYSCTL
-+	if (!skb->nf_bridge)
-+		return NF_ACCEPT;
-+#endif
-+
-+	if (skb->protocol != __constant_htons(ETH_P_IP)) {
-+		if (!IS_VLAN_IP)
-+			return NF_ACCEPT;
-+		skb_pull(*pskb, VLAN_HLEN);
-+		(*pskb)->nh.raw += VLAN_HLEN;
-+	}
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug ^= (1 << NF_BR_FORWARD);
-+#endif
-+	nf_bridge = skb->nf_bridge;
-+	if (skb->pkt_type == PACKET_OTHERHOST) {
-+		skb->pkt_type = PACKET_HOST;
-+		nf_bridge->mask |= BRNF_PKT_TYPE;
-+	}
-+
-+	/* The physdev module checks on this */
-+	nf_bridge->mask |= BRNF_BRIDGED;
-+	nf_bridge->physoutdev = skb->dev;
-+
-+	NF_HOOK(PF_INET, NF_IP_FORWARD, skb, bridge_parent(in),
-+		bridge_parent(out), br_nf_forward_finish);
-+
-+	return NF_STOLEN;
-+}
-+
-+/*
-+static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	struct sk_buff *skb = *pskb;
-+	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);
-+	struct net_device **d = (struct net_device **)(skb->cb);
-+
-+	if (!brnf_call_arptables)
-+		return NF_ACCEPT;
-+
-+	if (skb->protocol != __constant_htons(ETH_P_ARP)) {
-+		if (!IS_VLAN_ARP)
-+			return NF_ACCEPT;
-+		skb_pull(*pskb, VLAN_HLEN);
-+		(*pskb)->nh.raw += VLAN_HLEN;
-+	}
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug ^= (1 << NF_BR_FORWARD);
-+#endif
-+
-+	if (skb->nh.arph->ar_pln != 4) {
-+		if (IS_VLAN_ARP) {
-+			skb_push(*pskb, VLAN_HLEN);
-+			(*pskb)->nh.raw -= VLAN_HLEN;
-+		}
-+		return NF_ACCEPT;
-+	}
-+	*d = (struct net_device *)in;
-+	NF_HOOK(NF_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in,
-+		(struct net_device *)out, br_nf_forward_finish);
-+
-+	return NF_STOLEN;
-+}
-+*/
-+
-+/* PF_BRIDGE/LOCAL_OUT ***********************************************/
-+static int br_nf_local_out_finish(struct sk_buff *skb)
-+{
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	skb->nf_debug &= ~(1 << NF_BR_LOCAL_OUT);
-+#endif
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+		skb_push(skb, VLAN_HLEN);
-+		skb->nh.raw -= VLAN_HLEN;
-+	}
-+
-+	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
-+			br_forward_finish, NF_BR_PRI_FIRST + 1);
-+
-+	return 0;
-+}
-+
-+
-+/* This function sees both locally originated IP packets and forwarded
-+ * IP packets (in both cases the destination device is a bridge
-+ * device). It also sees bridged-and-DNAT'ed packets.
-+ * To be able to filter on the physical bridge devices (with the ipt_physdev.c
-+ * module), we steal packets destined to a bridge device away from the
-+ * PF_INET/FORWARD and PF_INET/OUTPUT hook functions, and give them back later,
-+ * when we have determined the real output device. This is done in here.
-+ *
-+ * If (nf_bridge->mask & BRNF_BRIDGED_DNAT) then the packet is bridged
-+ * and we fake the PF_BRIDGE/FORWARD hook. The function br_nf_forward()
-+ * will then fake the PF_INET/FORWARD hook. br_nf_local_out() has priority
-+ * NF_BR_PRI_FIRST, so no relevant PF_BRIDGE/INPUT functions have been nor
-+ * will be executed.
-+ * Otherwise, if nf_bridge->physindev is NULL, the bridge-nf code never touched
-+ * this packet before, and so the packet was locally originated. We fake
-+ * the PF_INET/LOCAL_OUT hook.
-+ * Finally, if nf_bridge->physindev isn't NULL, then the packet was IP routed,
-+ * so we fake the PF_INET/FORWARD hook. ipv4_sabotage_out() makes sure
-+ * even routed packets that didn't arrive on a bridge interface have their
-+ * nf_bridge->physindev set.
-+ */
-+
-+static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*_okfn)(struct sk_buff *))
-+{
-+	int (*okfn)(struct sk_buff *skb);
-+	struct net_device *realindev;
-+	struct sk_buff *skb = *pskb;
-+	struct nf_bridge_info *nf_bridge;
-+	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);
-+
-+#ifdef CONFIG_SYSCTL
-+	if (!skb->nf_bridge)
-+		return NF_ACCEPT;
-+#endif
-+
-+	if (skb->protocol != __constant_htons(ETH_P_IP) && !IS_VLAN_IP)
-+		return NF_ACCEPT;
-+
-+	/* Sometimes we get packets with NULL ->dst here (for example,
-+	 * running a dhcp client daemon triggers this).
-+	 */
-+	if (skb->dst == NULL)
-+		return NF_ACCEPT;
-+
-+	nf_bridge = skb->nf_bridge;
-+	nf_bridge->physoutdev = skb->dev;
-+	realindev = nf_bridge->physindev;
-+
-+	/* Bridged, take PF_BRIDGE/FORWARD.
-+	 * (see big note in front of br_nf_pre_routing_finish)
-+	 */
-+	if (nf_bridge->mask & BRNF_BRIDGED_DNAT) {
-+		okfn = br_forward_finish;
-+
-+		if (nf_bridge->mask & BRNF_PKT_TYPE) {
-+			skb->pkt_type = PACKET_OTHERHOST;
-+			nf_bridge->mask ^= BRNF_PKT_TYPE;
-+		}
-+		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+			skb_push(skb, VLAN_HLEN);
-+			skb->nh.raw -= VLAN_HLEN;
-+		}
-+
-+		NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev,
-+			skb->dev, okfn);
-+	} else {
-+		struct net_device *realoutdev = bridge_parent(skb->dev);
-+
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+		/* iptables should match -o br0.x */
-+		if (nf_bridge->netoutdev)
-+			realoutdev = nf_bridge->netoutdev;
-+#endif
-+		okfn = br_nf_local_out_finish;
-+		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+			skb_pull(skb, VLAN_HLEN);
-+			(*pskb)->nh.raw += VLAN_HLEN;
-+		}
-+		/* IP forwarded traffic has a physindev, locally
-+		 * generated traffic hasn't.
-+		 */
-+		if (realindev != NULL) {
-+			if (((nf_bridge->mask & BRNF_DONT_TAKE_PARENT) == 0) &&
-+			    has_bridge_parent(realindev))
-+				realindev = bridge_parent(realindev);
-+			NF_HOOK_THRESH(PF_INET, NF_IP_FORWARD, skb, realindev,
-+				       realoutdev, okfn,
-+				       NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD + 1);
-+		} else {
-+#ifdef CONFIG_NETFILTER_DEBUG
-+			skb->nf_debug ^= (1 << NF_IP_LOCAL_OUT);
-+#endif
-+
-+			NF_HOOK_THRESH(PF_INET, NF_IP_LOCAL_OUT, skb, realindev,
-+				       realoutdev, okfn,
-+				       NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT + 1);
-+		}
-+	}
-+
-+	return NF_STOLEN;
-+}
-+
-+
-+/* PF_BRIDGE/POST_ROUTING ********************************************/
-+static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	struct sk_buff *skb = *pskb;
-+	struct nf_bridge_info *nf_bridge = (*pskb)->nf_bridge;
-+	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);
-+	struct net_device *realoutdev = bridge_parent(skb->dev);
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	/* Be very paranoid. This probably won't happen anymore, but let's
-+	 * keep the check just to be sure... */
-+	if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) {
-+		printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "
-+				 "bad mac.raw pointer.");
-+		goto print_error;
-+	}
-+#endif
-+
-+#ifdef CONFIG_SYSCTL
-+	if (!nf_bridge)
-+		return NF_ACCEPT;
-+#endif
-+
-+	if (skb->protocol != __constant_htons(ETH_P_IP) && !IS_VLAN_IP)
-+		return NF_ACCEPT;
-+
-+	/* Sometimes we get packets with NULL ->dst here (for example,
-+	 * running a dhcp client daemon triggers this).
-+	 */
-+	if (skb->dst == NULL)
-+		return NF_ACCEPT;
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+	/* Sometimes we get packets with NULL ->dst here (for example,
-+	 * running a dhcp client daemon triggers this). This should now
-+	 * be fixed, but let's keep the check around.
-+	 */
-+	if (skb->dst == NULL) {
-+		printk(KERN_CRIT "br_netfilter: skb->dst == NULL.");
-+		goto print_error;
-+	}
-+
-+	skb->nf_debug ^= (1 << NF_IP_POST_ROUTING);
-+#endif
-+
-+	/* We assume any code from br_dev_queue_push_xmit onwards doesn't care
-+	 * about the value of skb->pkt_type.
-+	 */
-+	if (skb->pkt_type == PACKET_OTHERHOST) {
-+		skb->pkt_type = PACKET_HOST;
-+		nf_bridge->mask |= BRNF_PKT_TYPE;
-+	}
-+
-+	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-+		skb_pull(skb, VLAN_HLEN);
-+		skb->nh.raw += VLAN_HLEN;
-+	}
-+
-+	nf_bridge_save_header(skb);
-+
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+	if (nf_bridge->netoutdev)
-+		realoutdev = nf_bridge->netoutdev;
-+#endif
-+	NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL,
-+		realoutdev, br_dev_queue_push_xmit);
-+
-+	return NF_STOLEN;
-+
-+#ifdef CONFIG_NETFILTER_DEBUG
-+print_error:
-+	if (skb->dev != NULL) {
-+		printk("[%s]", skb->dev->name);
-+		if (has_bridge_parent(skb->dev))
-+			printk("[%s]", bridge_parent(skb->dev)->name);
-+	}
-+	printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
-+					      skb->data);
-+	return NF_ACCEPT;
-+#endif
-+}
-+
-+
-+/* IPv4/SABOTAGE *****************************************************/
-+
-+/* Don't hand locally destined packets to PF_INET/PRE_ROUTING
-+ * for the second time.
-+ */
-+static unsigned int ipv4_sabotage_in(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
-+{
-+	if ((*pskb)->nf_bridge &&
-+	    !((*pskb)->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)) {
-+		okfn(*pskb);
-+		return NF_STOLEN;
-+	}
-+
-+	return NF_ACCEPT;
-+}
-+
-+/* Postpone execution of PF_INET/FORWARD, PF_INET/LOCAL_OUT
-+ * and PF_INET/POST_ROUTING until we have done the forwarding
-+ * decision in the bridge code and have determined skb->physoutdev.
-+ */
-+static unsigned int ipv4_sabotage_out(unsigned int hook, struct sk_buff **pskb,
-+   const struct net_device *in, const struct net_device *out,
-+   int (*okfn)(struct sk_buff *))
++#ifdef CONFIG_NETFILTER
++static inline
++struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb)
 +{
-+	struct sk_buff *skb = *pskb;
-+
-+#ifdef CONFIG_SYSCTL
-+	if (!brnf_call_iptables && !skb->nf_bridge)
-+		return NF_ACCEPT;
-+#endif
-+
-+	if ((out->hard_start_xmit == br_dev_xmit &&
-+	    okfn != br_nf_forward_finish &&
-+	    okfn != br_nf_local_out_finish &&
-+	    okfn != br_dev_queue_push_xmit)
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+	    || ((out->priv_flags & IFF_802_1Q_VLAN) &&
-+	    VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit)
-+#endif
-+	    ) {
-+		struct nf_bridge_info *nf_bridge;
-+
-+		if (!skb->nf_bridge && !nf_bridge_alloc(skb))
-+			return NF_DROP;
-+
-+		nf_bridge = skb->nf_bridge;
++	struct nf_bridge_info **nf_bridge = &(skb->nf_bridge);
 +
-+		/* This frame will arrive on PF_BRIDGE/LOCAL_OUT and we
-+		 * will need the indev then. For a brouter, the real indev
-+		 * can be a bridge port, so we make sure br_nf_local_out()
-+		 * doesn't use the bridge parent of the indev by using
-+		 * the BRNF_DONT_TAKE_PARENT mask.
-+		 */
-+		if (hook == NF_IP_FORWARD && nf_bridge->physindev == NULL) {
-+			nf_bridge->mask &= BRNF_DONT_TAKE_PARENT;
-+			nf_bridge->physindev = (struct net_device *)in;
-+		}
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+		/* the iptables outdev is br0.x, not br0 */
-+		if (out->priv_flags & IFF_802_1Q_VLAN)
-+			nf_bridge->netoutdev = (struct net_device *)out;
-+#endif
-+		okfn(skb);
-+		return NF_STOLEN;
++	if ((*nf_bridge = kmalloc(sizeof(**nf_bridge), GFP_ATOMIC)) != NULL) {
++		atomic_set(&(*nf_bridge)->use, 1);
++		(*nf_bridge)->mask = 0;
++		(*nf_bridge)->physindev = (*nf_bridge)->physoutdev = NULL;
 +	}
 +
-+	return NF_ACCEPT;
-+}
-+
-+/* For br_nf_local_out we need (prio = NF_BR_PRI_FIRST), to insure that innocent
-+ * PF_BRIDGE/NF_BR_LOCAL_OUT functions don't get bridged traffic as input.
-+ * For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because
-+ * ip_refrag() can return NF_STOLEN.
-+ */
-+static struct nf_hook_ops br_nf_ops[] = {
-+	{ .hook = br_nf_pre_routing, 
-+	  .pf = PF_BRIDGE, 
-+	  .hooknum = NF_BR_PRE_ROUTING, 
-+	  .priority = NF_BR_PRI_BRNF, },
-+	{ .hook = br_nf_local_in,
-+	  .pf = PF_BRIDGE,
-+	  .hooknum = NF_BR_LOCAL_IN,
-+	  .priority = NF_BR_PRI_BRNF, },
-+	{ .hook = br_nf_forward_ip,
-+	  .pf = PF_BRIDGE,
-+	  .hooknum = NF_BR_FORWARD,
-+	  .priority = NF_BR_PRI_BRNF /*- 1*/, },
-+/*	{ .hook = br_nf_forward_arp,
-+	  .pf = PF_BRIDGE,
-+	  .hooknum = NF_BR_FORWARD,
-+	  .priority = NF_BR_PRI_BRNF, },*/
-+	{ .hook = br_nf_local_out,
-+	  .pf = PF_BRIDGE,
-+	  .hooknum = NF_BR_LOCAL_OUT,
-+	  .priority = NF_BR_PRI_FIRST, },
-+	{ .hook = br_nf_post_routing,
-+	  .pf = PF_BRIDGE,
-+	  .hooknum = NF_BR_POST_ROUTING,
-+	  .priority = NF_BR_PRI_LAST, },
-+	{ .hook = ipv4_sabotage_in,
-+	  .pf = PF_INET,
-+	  .hooknum = NF_IP_PRE_ROUTING,
-+	  .priority = NF_IP_PRI_FIRST, },
-+	{ .hook = ipv4_sabotage_out,
-+	  .pf = PF_INET,
-+	  .hooknum = NF_IP_FORWARD,
-+	  .priority = NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD, },
-+	{ .hook = ipv4_sabotage_out,
-+	  .pf = PF_INET,
-+	  .hooknum = NF_IP_LOCAL_OUT,
-+	  .priority = NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT, },
-+	{ .hook = ipv4_sabotage_out,
-+	  .pf = PF_INET,
-+	  .hooknum = NF_IP_POST_ROUTING,
-+	  .priority = NF_IP_PRI_FIRST, },
-+};
-+
-+#ifdef CONFIG_SYSCTL
-+static
-+int brnf_sysctl_call_tables(ctl_table *ctl, int write, struct file * filp,
-+			void *buffer, size_t *lenp)
-+{
-+	int ret;
-+
-+	ret = proc_dointvec(ctl, write, filp, buffer, lenp);
-+
-+	if (write && *(int *)(ctl->data))
-+		*(int *)(ctl->data) = 1;
-+	return ret;
++	return *nf_bridge;
 +}
 +
-+static ctl_table brnf_table[] = {
-+	{
-+		.ctl_name	= NET_BRIDGE_NF_CALL_ARPTABLES,
-+		.procname	= "bridge-nf-call-arptables",
-+		.data		= &brnf_call_arptables,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= &brnf_sysctl_call_tables,
-+	},
-+	{
-+		.ctl_name	= NET_BRIDGE_NF_CALL_IPTABLES,
-+		.procname	= "bridge-nf-call-iptables",
-+		.data		= &brnf_call_iptables,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= &brnf_sysctl_call_tables,
-+	},
-+	{
-+		.ctl_name	= NET_BRIDGE_NF_FILTER_VLAN_TAGGED,
-+		.procname	= "bridge-nf-filter-vlan-tagged",
-+		.data		= &brnf_filter_vlan_tagged,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= &brnf_sysctl_call_tables,
-+	},
-+	{ .ctl_name = 0 }
-+};
-+
-+static ctl_table brnf_bridge_table[] = {
-+	{
-+		.ctl_name	= NET_BRIDGE,
-+		.procname	= "bridge",
-+		.mode		= 0555,
-+		.child		= brnf_table,
-+	},
-+	{ .ctl_name = 0 }
-+};
-+
-+static ctl_table brnf_net_table[] = {
-+	{
-+		.ctl_name	= CTL_NET,
-+		.procname	= "net",
-+		.mode		= 0555,
-+		.child		= brnf_bridge_table,
-+	},
-+	{ .ctl_name = 0 }
++struct bridge_skb_cb {
++	union {
++		__u32 ipv4;
++	} daddr;
 +};
-+#endif
-+
-+int br_netfilter_init(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) {
-+		int ret;
-+
-+		if ((ret = nf_register_hook(&br_nf_ops[i])) >= 0)
-+			continue;
-+
-+		while (i--)
-+			nf_unregister_hook(&br_nf_ops[i]);
-+
-+		return ret;
-+	}
-+
-+#ifdef CONFIG_SYSCTL
-+	brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0);
-+	if (brnf_sysctl_header == NULL) {
-+		printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n");
-+		for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++)
-+			nf_unregister_hook(&br_nf_ops[i]);
-+		return -EFAULT;
-+	}
-+#endif
-+
-+	printk(KERN_NOTICE "Bridge firewalling registered\n");
-+
-+	return 0;
-+}
-+
-+void br_netfilter_fini(void)
-+{
-+	int i;
-+
-+	for (i = ARRAY_SIZE(br_nf_ops) - 1; i >= 0; i--)
-+		nf_unregister_hook(&br_nf_ops[i]);
-+#ifdef CONFIG_SYSCTL
-+	unregister_sysctl_table(brnf_sysctl_header);
-+#endif
++#endif /* CONFIG_NETFILTER */
 +
-+}
-diff -Nurb linux.stock/net/bridge/br_private.h linux/net/bridge/br_private.h
---- linux.stock/net/bridge/br_private.h	2003-10-14 04:09:32.000000000 -0400
-+++ linux/net/bridge/br_private.h	2004-07-10 23:46:39.000000000 -0400
-@@ -145,8 +145,10 @@
- /* br_forward.c */
- extern void br_deliver(struct net_bridge_port *to,
- 		struct sk_buff *skb);
-+extern int br_dev_queue_push_xmit(struct sk_buff *skb);
- extern void br_forward(struct net_bridge_port *to,
- 		struct sk_buff *skb);
-+extern int br_forward_finish(struct sk_buff *skb);
- extern void br_flood_deliver(struct net_bridge *br,
- 		      struct sk_buff *skb,
- 		      int clone);
-@@ -167,7 +169,8 @@
- 			   int *ifindices);
++#endif /* __KERNEL__ */
+ #endif
+--- linux-2.4.21/net/Makefile	Sat Aug  3 02:39:46 2002
++++ linux-2.4.21-ebt-brnf-3/net/Makefile	Fri Aug  8 01:09:06 2003
+@@ -7,7 +7,8 @@
  
- /* br_input.c */
--extern void br_handle_frame(struct sk_buff *skb);
-+extern int br_handle_frame_finish(struct sk_buff *skb);
-+extern int br_handle_frame(struct sk_buff *skb);
+ O_TARGET :=	network.o
  
- /* br_ioctl.c */
- extern void br_call_ioctl_atomic(void (*fn)(void));
-@@ -178,6 +181,10 @@
- 	     unsigned long arg2);
- extern int br_ioctl_deviceless_stub(unsigned long arg);
+-mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core
++mod-subdirs :=	ipv4/netfilter ipv6/netfilter bridge/netfilter ipx irda \
++	bluetooth atm netlink sched core
+ export-objs :=	netsyms.o
  
-+/* br_netfilter.c */
-+extern int br_netfilter_init(void);
-+extern void br_netfilter_fini(void);
+ subdir-y :=	core ethernet
+@@ -23,6 +24,12 @@ subdir-$(CONFIG_IPV6)		+= ipv6
+ ifneq ($(CONFIG_IPV6),n)
+ ifneq ($(CONFIG_IPV6),)
+ subdir-$(CONFIG_NETFILTER)	+= ipv6/netfilter
++endif
++endif
 +
- /* br_stp.c */
- extern int br_is_root_bridge(struct net_bridge *br);
- extern struct net_bridge_port *br_get_port(struct net_bridge *br,
-diff -Nurb linux.stock/net/bridge/netfilter/Config.in linux/net/bridge/netfilter/Config.in
---- linux.stock/net/bridge/netfilter/Config.in	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,22 @@
-+#
-+# Bridge netfilter configuration
-+#
-+dep_tristate '  Bridge: ebtables' CONFIG_BRIDGE_NF_EBTABLES $CONFIG_BRIDGE
-+dep_tristate '    ebt: filter table support' CONFIG_BRIDGE_EBT_T_FILTER $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: nat table support' CONFIG_BRIDGE_EBT_T_NAT $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: broute table support' CONFIG_BRIDGE_EBT_BROUTE $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: log support' CONFIG_BRIDGE_EBT_LOG $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: IP filter support' CONFIG_BRIDGE_EBT_IPF $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: ARP filter support' CONFIG_BRIDGE_EBT_ARPF $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: among filter support' CONFIG_BRIDGE_EBT_AMONG $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: limit filter support' CONFIG_BRIDGE_EBT_LIMIT $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: 802.1Q VLAN filter support' CONFIG_BRIDGE_EBT_VLANF $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: 802.3 filter support' CONFIG_BRIDGE_EBT_802_3 $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: packet type filter support' CONFIG_BRIDGE_EBT_PKTTYPE $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: STP filter support' CONFIG_BRIDGE_EBT_STP $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: mark filter support' CONFIG_BRIDGE_EBT_MARKF $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: arp reply target support' CONFIG_BRIDGE_EBT_ARPREPLY $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: snat target support' CONFIG_BRIDGE_EBT_SNAT $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: dnat target support' CONFIG_BRIDGE_EBT_DNAT $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES
-+dep_tristate '    ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES
-diff -Nurb linux.stock/net/bridge/netfilter/Makefile linux/net/bridge/netfilter/Makefile
---- linux.stock/net/bridge/netfilter/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,33 @@
++ifneq ($(CONFIG_BRIDGE),n)
++ifneq ($(CONFIG_BRIDGE),)
++subdir-$(CONFIG_BRIDGE)		+= bridge/netfilter
+ endif
+ endif
+ 
+--- linux-2.4.21/net/Config.in	Sat Aug  3 02:39:46 2002
++++ linux-2.4.21-ebt-brnf-3/net/Config.in	Fri Aug  8 01:09:06 2003
+@@ -65,6 +65,9 @@ if [ "$CONFIG_DECNET" != "n" ]; then
+    source net/decnet/Config.in
+ fi
+ dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET
++if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then
++   source net/bridge/netfilter/Config.in
++fi
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
+    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/Makefile	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,30 @@
 +#
 +# Makefile for the netfilter modules on top of bridging.
 +#
@@ -2256,1028 +398,394 @@ diff -Nurb linux.stock/net/bridge/netfilter/Makefile linux/net/bridge/netfilter/
 +obj-$(CONFIG_BRIDGE_EBT_T_FILTER) += ebtable_filter.o
 +obj-$(CONFIG_BRIDGE_EBT_T_NAT) += ebtable_nat.o
 +obj-$(CONFIG_BRIDGE_EBT_BROUTE) += ebtable_broute.o
-+obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_802_3.o
-+obj-$(CONFIG_BRIDGE_EBT_ARPF) += ebt_arp.o
-+obj-$(CONFIG_BRIDGE_EBT_AMONG) += ebt_among.o
 +obj-$(CONFIG_BRIDGE_EBT_IPF) += ebt_ip.o
-+obj-$(CONFIG_BRIDGE_EBT_LIMIT) += ebt_limit.o
++obj-$(CONFIG_BRIDGE_EBT_ARPF) += ebt_arp.o
++obj-$(CONFIG_BRIDGE_EBT_VLANF) += ebt_vlan.o
 +obj-$(CONFIG_BRIDGE_EBT_MARKF) += ebt_mark_m.o
++obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_802_3.o
 +obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o
-+obj-$(CONFIG_BRIDGE_EBT_STP) += ebt_stp.o
-+obj-$(CONFIG_BRIDGE_EBT_VLANF) += ebt_vlan.o
++obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_stp.o
 +obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o
-+obj-$(CONFIG_BRIDGE_EBT_ARPREPLY) += ebt_arpreply.o
++obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o
 +obj-$(CONFIG_BRIDGE_EBT_DNAT) += ebt_dnat.o
-+obj-$(CONFIG_BRIDGE_EBT_MARK_T) += ebt_mark.o
 +obj-$(CONFIG_BRIDGE_EBT_REDIRECT) += ebt_redirect.o
-+obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o
++obj-$(CONFIG_BRIDGE_EBT_MARK_T) += ebt_mark.o
 +include $(TOPDIR)/Rules.make
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_802_3.c linux/net/bridge/netfilter/ebt_802_3.c
---- linux.stock/net/bridge/netfilter/ebt_802_3.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_802_3.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,74 @@
-+/*
-+ * 802_3
-+ *
-+ * Author:
-+ * Chris Vitale csv@bluetail.com
-+ *
-+ * May 2003
-+ * 
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_802_3.h>
-+#include <linux/module.h>
-+
-+static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *in,
-+   const struct net_device *out, const void *data, unsigned int datalen)
-+{
-+	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
-+	struct ebt_802_3_hdr *hdr = (struct ebt_802_3_hdr *)skb->mac.ethernet;
-+	uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
-+
-+	if (info->bitmask & EBT_802_3_SAP) {
-+		if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP)) 
-+				return EBT_NOMATCH;
-+		if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
-+				return EBT_NOMATCH;
-+	}
-+
-+	if (info->bitmask & EBT_802_3_TYPE) {
-+		if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
-+			return EBT_NOMATCH;
-+		if (FWINV(info->type != type, EBT_802_3_TYPE)) 
-+			return EBT_NOMATCH;
-+	}
-+
-+	return EBT_MATCH;
-+}
-+
-+static struct ebt_match filter_802_3;
-+static int ebt_802_3_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
-+{
-+	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_802_3_info)))
-+		return -EINVAL;
-+	if (info->bitmask & ~EBT_802_3_MASK || info->invflags & ~EBT_802_3_MASK)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static struct ebt_match filter_802_3 =
-+{
-+	.name		= EBT_802_3_MATCH,
-+	.match		= ebt_filter_802_3,
-+	.check		= ebt_802_3_check,
-+	.me		= THIS_MODULE,
-+};
-+
-+static int __init init(void)
-+{
-+	return ebt_register_match(&filter_802_3);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_match(&filter_802_3);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_among.c linux/net/bridge/netfilter/ebt_among.c
---- linux.stock/net/bridge/netfilter/ebt_among.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_among.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,223 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/Config.in	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,19 @@
++#
++# Bridge netfilter configuration
++#
++dep_tristate '  Bridge: ebtables' CONFIG_BRIDGE_NF_EBTABLES $CONFIG_BRIDGE
++dep_tristate '    ebt: filter table support' CONFIG_BRIDGE_EBT_T_FILTER $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: nat table support' CONFIG_BRIDGE_EBT_T_NAT $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: broute table support' CONFIG_BRIDGE_EBT_BROUTE $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: log support' CONFIG_BRIDGE_EBT_LOG $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: IP filter support' CONFIG_BRIDGE_EBT_IPF $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: ARP filter support' CONFIG_BRIDGE_EBT_ARPF $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: 802.1Q VLAN filter support' CONFIG_BRIDGE_EBT_VLANF $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: 802.3 filter support' CONFIG_BRIDGE_EBT_802_3 $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: packet type filter support' CONFIG_BRIDGE_EBT_PKTTYPE $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: STP filter support' CONFIG_BRIDGE_EBT_STP $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: mark filter support' CONFIG_BRIDGE_EBT_MARKF $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: snat target support' CONFIG_BRIDGE_EBT_SNAT $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: dnat target support' CONFIG_BRIDGE_EBT_DNAT $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES
++dep_tristate '    ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebtable_filter.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,90 @@
 +/*
-+ *  ebt_among
++ *  ebtable_filter
 + *
 + *	Authors:
-+ *	Grzegorz Borowiak <grzes@gnu.univ.gda.pl>
++ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
 + *
-+ *  August, 2003
++ *  April, 2002
 + *
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_among.h>
-+#include <linux/ip.h>
-+#include <linux/if_arp.h>
 +#include <linux/module.h>
 +
-+static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
-+				     const char *mac, uint32_t ip)
-+{
-+	/* You may be puzzled as to how this code works.
-+	 * Some tricks were used, refer to 
-+	 * 	include/linux/netfilter_bridge/ebt_among.h
-+	 * as there you can find a solution of this mystery.
-+	 */
-+	const struct ebt_mac_wormhash_tuple *p;
-+	int start, limit, i;
-+	uint32_t cmp[2] = { 0, 0 };
-+	int key = (const unsigned char) mac[5];
-+
-+	memcpy(((char *) cmp) + 2, mac, 6);
-+	start = wh->table[key];
-+	limit = wh->table[key + 1];
-+	if (ip) {
-+		for (i = start; i < limit; i++) {
-+			p = &wh->pool[i];
-+			if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) {
-+				if (p->ip == 0 || p->ip == ip) {
-+					return 1;
-+				}
-+			}
-+		}
-+	} else {
-+		for (i = start; i < limit; i++) {
-+			p = &wh->pool[i];
-+			if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) {
-+				if (p->ip == 0) {
-+					return 1;
-+				}
-+			}
-+		}
-+	}
-+	return 0;
-+}
++#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
++   (1 << NF_BR_LOCAL_OUT))
 +
-+static int ebt_mac_wormhash_check_integrity(const struct ebt_mac_wormhash
-+					    *wh)
++static struct ebt_entries initial_chains[] =
 +{
-+	int i;
-+
-+	for (i = 0; i < 256; i++) {
-+		if (wh->table[i] > wh->table[i + 1])
-+			return -0x100 - i;
-+		if (wh->table[i] < 0)
-+			return -0x200 - i;
-+		if (wh->table[i] > wh->poolsize)
-+			return -0x300 - i;
-+	}
-+	if (wh->table[256] > wh->poolsize)
-+		return -0xc00;
-+	return 0;
-+}
++  {0, "INPUT", 0, EBT_ACCEPT, 0},
++  {0, "FORWARD", 0, EBT_ACCEPT, 0},
++  {0, "OUTPUT", 0, EBT_ACCEPT, 0}
++};
 +
-+static int get_ip_dst(const struct sk_buff *skb, uint32_t * addr)
++static struct ebt_replace initial_table =
 +{
-+	if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_IP))
-+		*addr = skb->nh.iph->daddr;
-+	else if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) {
-+		uint32_t arp_len = sizeof(struct arphdr) +
-+		    (2 * (((*skb).nh.arph)->ar_hln)) +
-+		    (2 * (((*skb).nh.arph)->ar_pln));
-+
-+		/* Make sure the packet is long enough. */
-+		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
-+			return -1;
-+		/* IPv4 addresses are always 4 bytes. */
-+		if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t))
-+			return -1;
-+
-+		memcpy(addr, ((*skb).nh.raw) + sizeof(struct arphdr) +
-+		       (2 * (((*skb).nh.arph)->ar_hln)) +
-+		       (((*skb).nh.arph)->ar_pln), sizeof(uint32_t));
-+
-+	}
-+	return 0;
-+}
++  "filter", FILTER_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries),
++  { [NF_BR_LOCAL_IN]&initial_chains[0], [NF_BR_FORWARD]&initial_chains[1],
++    [NF_BR_LOCAL_OUT]&initial_chains[2] }, 0, NULL, (char *)initial_chains
++};
 +
-+static int get_ip_src(const struct sk_buff *skb, uint32_t * addr)
++static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
 +{
-+	if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_IP))
-+		*addr = skb->nh.iph->saddr;
-+	else if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) {
-+		uint32_t arp_len = sizeof(struct arphdr) +
-+		    (2 * (((*skb).nh.arph)->ar_hln)) +
-+		    (2 * (((*skb).nh.arph)->ar_pln));
-+
-+		/* Make sure the packet is long enough. */
-+		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
-+			return -1;
-+		/* IPv4 addresses are always 4 bytes. */
-+		if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t))
-+			return -1;
-+
-+		memcpy(addr, ((*skb).nh.raw) + sizeof(struct arphdr) +
-+		       ((((*skb).nh.arph)->ar_hln)), sizeof(uint32_t));
-+
-+	}
++	if (valid_hooks & ~FILTER_VALID_HOOKS)
++		return -EINVAL;
 +	return 0;
 +}
 +
-+static int ebt_filter_among(const struct sk_buff *skb,
-+			    const struct net_device *in,
-+			    const struct net_device *out, const void *data,
-+			    unsigned int datalen)
-+{
-+	struct ebt_among_info *info = (struct ebt_among_info *) data;
-+	const char *dmac, *smac;
-+	const struct ebt_mac_wormhash *wh_dst, *wh_src;
-+	uint32_t dip = 0, sip = 0;
-+
-+	wh_dst = ebt_among_wh_dst(info);
-+	wh_src = ebt_among_wh_src(info);
-+
-+	if (wh_src) {
-+		smac = skb->mac.ethernet->h_source;
-+		if (get_ip_src(skb, &sip))
-+			return EBT_NOMATCH;
-+		if (!(info->bitmask & EBT_AMONG_SRC_NEG)) {
-+			/* we match only if it contains */
-+			if (!ebt_mac_wormhash_contains(wh_src, smac, sip))
-+				return EBT_NOMATCH;
-+		} else {
-+			/* we match only if it DOES NOT contain */
-+			if (ebt_mac_wormhash_contains(wh_src, smac, sip))
-+				return EBT_NOMATCH;
-+		}
-+	}
-+
-+	if (wh_dst) {
-+		dmac = skb->mac.ethernet->h_dest;
-+		if (get_ip_dst(skb, &dip))
-+			return EBT_NOMATCH;
-+		if (!(info->bitmask & EBT_AMONG_DST_NEG)) {
-+			/* we match only if it contains */
-+			if (!ebt_mac_wormhash_contains(wh_dst, dmac, dip))
-+				return EBT_NOMATCH;
-+		} else {
-+			/* we match only if it DOES NOT contain */
-+			if (ebt_mac_wormhash_contains(wh_dst, dmac, dip))
-+				return EBT_NOMATCH;
-+		}
-+	}
-+
-+	return EBT_MATCH;
-+}
++static struct ebt_table frame_filter =
++{ 
++  {NULL, NULL}, "filter", &initial_table, FILTER_VALID_HOOKS, 
++  RW_LOCK_UNLOCKED, check, NULL
++};
 +
-+static int ebt_among_check(const char *tablename, unsigned int hookmask,
-+			   const struct ebt_entry *e, void *data,
-+			   unsigned int datalen)
-+{
-+	struct ebt_among_info *info = (struct ebt_among_info *) data;
-+	int expected_length = sizeof(struct ebt_among_info);
-+	const struct ebt_mac_wormhash *wh_dst, *wh_src;
-+	int err;
-+
-+	wh_dst = ebt_among_wh_dst(info);
-+	wh_src = ebt_among_wh_src(info);
-+	expected_length += ebt_mac_wormhash_size(wh_dst);
-+	expected_length += ebt_mac_wormhash_size(wh_src);
-+
-+	if (datalen != EBT_ALIGN(expected_length)) {
-+		printk(KERN_WARNING
-+		       "ebtables: among: wrong size: %d"
-+		       "against expected %d, rounded to %d\n",
-+		       datalen, expected_length,
-+		       EBT_ALIGN(expected_length));
-+		return -EINVAL;
-+	}
-+	if (wh_dst && (err = ebt_mac_wormhash_check_integrity(wh_dst))) {
-+		printk(KERN_WARNING
-+		       "ebtables: among: dst integrity fail: %x\n", -err);
-+		return -EINVAL;
-+	}
-+	if (wh_src && (err = ebt_mac_wormhash_check_integrity(wh_src))) {
-+		printk(KERN_WARNING
-+		       "ebtables: among: src integrity fail: %x\n", -err);
-+		return -EINVAL;
-+	}
-+	return 0;
++static unsigned int
++ebt_hook (unsigned int hook, struct sk_buff **pskb, const struct net_device *in,
++   const struct net_device *out, int (*okfn)(struct sk_buff *))
++{
++	return ebt_do_table(hook, pskb, in, out, &frame_filter);
 +}
 +
-+static struct ebt_match filter_among = {
-+	{NULL, NULL}, 
-+	EBT_AMONG_MATCH, 
-+	ebt_filter_among, 
-+	ebt_among_check,
-+	NULL,
-+	THIS_MODULE
++static struct nf_hook_ops ebt_ops_filter[] = {
++	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_IN,
++	   NF_BR_PRI_FILTER_BRIDGED},
++	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_FORWARD,
++	   NF_BR_PRI_FILTER_BRIDGED},
++	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_OUT,
++	   NF_BR_PRI_FILTER_OTHER}
 +};
 +
 +static int __init init(void)
 +{
-+	return ebt_register_match(&filter_among);
++	int i, j, ret;
++
++	ret = ebt_register_table(&frame_filter);
++	if (ret < 0)
++		return ret;
++	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
++		if ((ret = nf_register_hook(&ebt_ops_filter[i])) < 0)
++			goto cleanup;
++	return ret;
++cleanup:
++	for (j = 0; j < i; j++)
++		nf_unregister_hook(&ebt_ops_filter[j]);
++	ebt_unregister_table(&frame_filter);
++	return ret;
 +}
 +
 +static void __exit fini(void)
 +{
-+	ebt_unregister_match(&filter_among);
++	int i;
++
++	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
++		nf_unregister_hook(&ebt_ops_filter[i]);
++	ebt_unregister_table(&frame_filter);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_arp.c linux/net/bridge/netfilter/ebt_arp.c
---- linux.stock/net/bridge/netfilter/ebt_arp.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_arp.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,149 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebtable_nat.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,96 @@
 +/*
-+ *  ebt_arp
++ *  ebtable_nat
 + *
 + *	Authors:
 + *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *	Tim Gardner <timg@tpi.com>
 + *
 + *  April, 2002
 + *
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_arp.h>
-+#include <linux/if_arp.h>
-+#include <linux/if_ether.h>
 +#include <linux/module.h>
++#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
++   (1 << NF_BR_POST_ROUTING))
 +
-+static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in,
-+   const struct net_device *out, const void *data, unsigned int datalen)
-+{
-+	struct ebt_arp_info *info = (struct ebt_arp_info *)data;
-+
-+	if (info->bitmask & EBT_ARP_OPCODE && FWINV(info->opcode !=
-+	   ((*skb).nh.arph)->ar_op, EBT_ARP_OPCODE))
-+		return EBT_NOMATCH;
-+	if (info->bitmask & EBT_ARP_HTYPE && FWINV(info->htype !=
-+	   ((*skb).nh.arph)->ar_hrd, EBT_ARP_HTYPE))
-+		return EBT_NOMATCH;
-+	if (info->bitmask & EBT_ARP_PTYPE && FWINV(info->ptype !=
-+	   ((*skb).nh.arph)->ar_pro, EBT_ARP_PTYPE))
-+		return EBT_NOMATCH;
-+
-+	if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP))
-+	{
-+		uint32_t arp_len = sizeof(struct arphdr) +
-+		   (2 * (((*skb).nh.arph)->ar_hln)) +
-+		   (2 * (((*skb).nh.arph)->ar_pln));
-+		uint32_t dst;
-+		uint32_t src;
-+
-+		// Make sure the packet is long enough.
-+		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
-+			return EBT_NOMATCH;
-+		// IPv4 addresses are always 4 bytes.
-+		if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t))
-+			return EBT_NOMATCH;
-+
-+		if (info->bitmask & EBT_ARP_SRC_IP) {
-+			memcpy(&src, ((*skb).nh.raw) + sizeof(struct arphdr) +
-+			   ((*skb).nh.arph)->ar_hln, sizeof(uint32_t));
-+			if (FWINV(info->saddr != (src & info->smsk),
-+			   EBT_ARP_SRC_IP))
-+				return EBT_NOMATCH;
-+		}
-+
-+		if (info->bitmask & EBT_ARP_DST_IP) {
-+			memcpy(&dst, ((*skb).nh.raw)+sizeof(struct arphdr) +
-+			   (2*(((*skb).nh.arph)->ar_hln)) +
-+			   (((*skb).nh.arph)->ar_pln), sizeof(uint32_t));
-+			if (FWINV(info->daddr != (dst & info->dmsk),
-+			   EBT_ARP_DST_IP))
-+				return EBT_NOMATCH;
-+		}
-+	}
-+
-+	if (info->bitmask & (EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC))
-+	{
-+		uint32_t arp_len = sizeof(struct arphdr) +
-+		   (2 * (((*skb).nh.arph)->ar_hln)) +
-+		   (2 * (((*skb).nh.arph)->ar_pln));
-+		unsigned char dst[ETH_ALEN];
-+		unsigned char src[ETH_ALEN];
-+
-+		// Make sure the packet is long enough.
-+		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
-+			return EBT_NOMATCH;
-+		// MAC addresses are 6 bytes.
-+		if (((*skb).nh.arph)->ar_hln != ETH_ALEN)
-+			return EBT_NOMATCH;
-+		if (info->bitmask & EBT_ARP_SRC_MAC) {
-+			uint8_t verdict, i;
-+
-+			memcpy(&src, ((*skb).nh.raw) +
-+					sizeof(struct arphdr),
-+					ETH_ALEN);
-+			verdict = 0;
-+			for (i = 0; i < 6; i++)
-+				verdict |= (src[i] ^ info->smaddr[i]) &
-+				       info->smmsk[i];	
-+			if (FWINV(verdict != 0, EBT_ARP_SRC_MAC))
-+				return EBT_NOMATCH;
-+		}
-+
-+		if (info->bitmask & EBT_ARP_DST_MAC) { 
-+			uint8_t verdict, i;
-+
-+			memcpy(&dst, ((*skb).nh.raw) +
-+					sizeof(struct arphdr) +
-+			   		(((*skb).nh.arph)->ar_hln) +
-+			   		(((*skb).nh.arph)->ar_pln),
-+					ETH_ALEN);
-+			verdict = 0;
-+			for (i = 0; i < 6; i++)
-+				verdict |= (dst[i] ^ info->dmaddr[i]) &
-+					info->dmmsk[i];
-+			if (FWINV(verdict != 0, EBT_ARP_DST_MAC))
-+				return EBT_NOMATCH;
-+		}
-+	}
-+
-+	return EBT_MATCH;
-+}
-+
-+static int ebt_arp_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
-+{
-+	struct ebt_arp_info *info = (struct ebt_arp_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_arp_info)))
-+		return -EINVAL;
-+	if ((e->ethproto != __constant_htons(ETH_P_ARP) &&
-+	   e->ethproto != __constant_htons(ETH_P_RARP)) ||
-+	   e->invflags & EBT_IPROTO)
-+		return -EINVAL;
-+	if (info->bitmask & ~EBT_ARP_MASK || info->invflags & ~EBT_ARP_MASK)
-+		return -EINVAL;
-+	return 0;
-+}
-+
-+static struct ebt_match filter_arp =
++static struct ebt_entries initial_chains[] =
 +{
-+	{NULL, NULL}, EBT_ARP_MATCH, ebt_filter_arp, ebt_arp_check, NULL,
-+	THIS_MODULE
++  {0, "PREROUTING", 0, EBT_ACCEPT, 0},
++  {0, "OUTPUT", 0, EBT_ACCEPT, 0},
++  {0, "POSTROUTING", 0, EBT_ACCEPT, 0}
 +};
 +
-+static int __init init(void)
-+{
-+	return ebt_register_match(&filter_arp);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_match(&filter_arp);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_arpreply.c linux/net/bridge/netfilter/ebt_arpreply.c
---- linux.stock/net/bridge/netfilter/ebt_arpreply.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_arpreply.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,86 @@
-+/*
-+ *  ebt_arpreply
-+ *
-+ *	Authors:
-+ *	Grzegorz Borowiak <grzes@gnu.univ.gda.pl>
-+ *	Bart De Schuymer <bdschuym@pandora.be>
-+ *
-+ *  August, 2003
-+ *
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_arpreply.h>
-+#include <linux/if_arp.h>
-+#include <net/arp.h>
-+#include <linux/module.h>
-+
-+static int ebt_target_reply(struct sk_buff **pskb, unsigned int hooknr,
-+   const struct net_device *in, const struct net_device *out,
-+   const void *data, unsigned int datalen)
++static struct ebt_replace initial_table =
 +{
-+	struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data;
-+	struct arphdr *ah;
-+	unsigned char *sha, *arp_ptr;
-+	u32 sip, tip;
-+
-+	ah = (**pskb).nh.arph;
-+	if (ah->ar_op != __constant_htons(ARPOP_REQUEST) ||
-+	    ah->ar_hln != ETH_ALEN || ah->ar_pro != htons(ETH_P_IP) ||
-+	    ah->ar_pln != 4)
-+		return EBT_CONTINUE;
-+
-+	arp_ptr = (unsigned char *)(ah + 1);
-+
-+	/* get source and target IP */
-+	sha = arp_ptr;
-+	arp_ptr += ETH_ALEN;
-+	memcpy(&sip, arp_ptr, 4);
-+	arp_ptr += 4 + ETH_ALEN;
-+	memcpy(&tip, arp_ptr, 4);
-+
-+	arp_send(ARPOP_REPLY, ETH_P_ARP, sip, in, tip, sha, info->mac, sha);
-+
-+	return info->target;
-+}
++  "nat", NAT_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries),
++  { [NF_BR_PRE_ROUTING]&initial_chains[0], [NF_BR_LOCAL_OUT]&initial_chains[1],
++    [NF_BR_POST_ROUTING]&initial_chains[2] }, 0, NULL, (char *)initial_chains
++};
 +
-+static int ebt_target_reply_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
++static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
 +{
-+	struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_arpreply_info)))
-+		return -EINVAL;
-+	if (BASE_CHAIN && info->target == EBT_RETURN)
-+		return -EINVAL;
-+	if (e->ethproto != __constant_htons(ETH_P_ARP) ||
-+	    e->invflags & EBT_IPROTO)
-+		return -EINVAL;
-+	CLEAR_BASE_CHAIN_BIT;
-+	if (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING))
++	if (valid_hooks & ~NAT_VALID_HOOKS)
 +		return -EINVAL;
 +	return 0;
 +}
 +
-+static struct ebt_target reply_target =
++static struct ebt_table frame_nat =
 +{
-+	.name		= EBT_ARPREPLY_TARGET,
-+	.target		= ebt_target_reply,
-+	.check		= ebt_target_reply_check,
-+	.me		= THIS_MODULE,
++  {NULL, NULL}, "nat", &initial_table, NAT_VALID_HOOKS,
++  RW_LOCK_UNLOCKED, check, NULL
 +};
 +
-+static int __init init(void)
-+{
-+	return ebt_register_target(&reply_target);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_target(&reply_target);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_dnat.c linux/net/bridge/netfilter/ebt_dnat.c
---- linux.stock/net/bridge/netfilter/ebt_dnat.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_dnat.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,65 @@
-+/*
-+ *  ebt_dnat
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *
-+ *  June, 2002
-+ *
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_nat.h>
-+#include <linux/module.h>
-+#include <net/sock.h>
-+
-+static int ebt_target_dnat(struct sk_buff **pskb, unsigned int hooknr,
-+   const struct net_device *in, const struct net_device *out,
-+   const void *data, unsigned int datalen)
++static unsigned int
++ebt_nat_dst(unsigned int hook, struct sk_buff **pskb, const struct net_device *in
++   , const struct net_device *out, int (*okfn)(struct sk_buff *))
 +{
-+	struct ebt_nat_info *info = (struct ebt_nat_info *)data;
-+
-+	memcpy(((**pskb).mac.ethernet)->h_dest, info->mac,
-+	   ETH_ALEN * sizeof(unsigned char));
-+	return info->target;
++	return ebt_do_table(hook, pskb, in, out, &frame_nat);
 +}
 +
-+static int ebt_target_dnat_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
++static unsigned int
++ebt_nat_src(unsigned int hook, struct sk_buff **pskb, const struct net_device *in
++   , const struct net_device *out, int (*okfn)(struct sk_buff *))
 +{
-+	struct ebt_nat_info *info = (struct ebt_nat_info *)data;
-+
-+	if (BASE_CHAIN && info->target == EBT_RETURN)
-+		return -EINVAL;
-+	CLEAR_BASE_CHAIN_BIT;
-+	if ( (strcmp(tablename, "nat") ||
-+	   (hookmask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT)))) &&
-+	   (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) )
-+		return -EINVAL;
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info)))
-+		return -EINVAL;
-+	if (INVALID_TARGET)
-+		return -EINVAL;
-+	return 0;
++	return ebt_do_table(hook, pskb, in, out, &frame_nat);
 +}
 +
-+static struct ebt_target dnat =
-+{
-+	{NULL, NULL}, EBT_DNAT_TARGET, ebt_target_dnat, ebt_target_dnat_check,
-+	NULL, THIS_MODULE
++static struct nf_hook_ops ebt_ops_nat[] = {
++	{ { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_LOCAL_OUT,
++	   NF_BR_PRI_NAT_DST_OTHER},
++	{ { NULL, NULL }, ebt_nat_src, PF_BRIDGE, NF_BR_POST_ROUTING,
++	   NF_BR_PRI_NAT_SRC},
++	{ { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_PRE_ROUTING,
++	   NF_BR_PRI_NAT_DST_BRIDGED},
 +};
 +
 +static int __init init(void)
 +{
-+	return ebt_register_target(&dnat);
++	int i, ret, j;
++
++	ret = ebt_register_table(&frame_nat);
++	if (ret < 0)
++		return ret;
++	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
++		if ((ret = nf_register_hook(&ebt_ops_nat[i])) < 0)
++			goto cleanup;
++	return ret;
++cleanup:
++	for (j = 0; j < i; j++)
++		nf_unregister_hook(&ebt_ops_nat[j]);
++	ebt_unregister_table(&frame_nat);
++	return ret;
 +}
 +
 +static void __exit fini(void)
 +{
-+	ebt_unregister_target(&dnat);
++	int i;
++
++	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
++		nf_unregister_hook(&ebt_ops_nat[i]);
++	ebt_unregister_table(&frame_nat);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_ip.c linux/net/bridge/netfilter/ebt_ip.c
---- linux.stock/net/bridge/netfilter/ebt_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_ip.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,121 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebtable_broute.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,79 @@
 +/*
-+ *  ebt_ip
++ *  ebtable_broute
 + *
 + *	Authors:
 + *	Bart De Schuymer <bart.de.schuymer@pandora.be>
 + *
 + *  April, 2002
 + *
-+ *  Changes:
-+ *    added ip-sport and ip-dport
-+ *    Innominate Security Technologies AG <mhopf@innominate.com>
-+ *    September, 2002
++ *  This table lets you choose between routing and bridging for frames
++ *  entering on a bridge enslaved nic. This table is traversed before any
++ *  other ebtables table. See net/bridge/br_input.c.
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_ip.h>
-+#include <linux/ip.h>
-+#include <linux/in.h>
 +#include <linux/module.h>
++#include <linux/if_bridge.h>
++#include <linux/brlock.h>
 +
-+struct tcpudphdr {
-+	uint16_t src;
-+	uint16_t dst;
-+};
-+
-+union h_u {
-+	unsigned char *raw;
-+	struct tcpudphdr *tuh;
-+};
++// EBT_ACCEPT means the frame will be bridged
++// EBT_DROP means the frame will be routed
++static struct ebt_entries initial_chain =
++  {0, "BROUTING", 0, EBT_ACCEPT, 0};
 +
-+static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,
-+   const struct net_device *out, const void *data,
-+   unsigned int datalen)
++static struct ebt_replace initial_table =
 +{
-+	struct ebt_ip_info *info = (struct ebt_ip_info *)data;
-+
-+	if (info->bitmask & EBT_IP_TOS &&
-+	   FWINV(info->tos != ((*skb).nh.iph)->tos, EBT_IP_TOS))
-+		return EBT_NOMATCH;
-+	if (info->bitmask & EBT_IP_PROTO) {
-+		if (FWINV(info->protocol != ((*skb).nh.iph)->protocol,
-+		          EBT_IP_PROTO))
-+			return EBT_NOMATCH;
-+		if ( info->protocol == IPPROTO_TCP ||
-+		     info->protocol == IPPROTO_UDP )
-+		{
-+			union h_u h;
-+			h.raw = skb->data + skb->nh.iph->ihl*4;
-+			if (info->bitmask & EBT_IP_DPORT) {
-+				uint16_t port = ntohs(h.tuh->dst);
-+				if (FWINV(port < info->dport[0] ||
-+				          port > info->dport[1],
-+				          EBT_IP_DPORT))
-+				return EBT_NOMATCH;
-+			}
-+			if (info->bitmask & EBT_IP_SPORT) {
-+				uint16_t port = ntohs(h.tuh->src);
-+				if (FWINV(port < info->sport[0] ||
-+				          port > info->sport[1],
-+				          EBT_IP_SPORT))
-+				return EBT_NOMATCH;
-+			}
-+		}
-+	}
-+	if (info->bitmask & EBT_IP_SOURCE &&
-+	   FWINV((((*skb).nh.iph)->saddr & info->smsk) !=
-+	   info->saddr, EBT_IP_SOURCE))
-+		return EBT_NOMATCH;
-+	if ((info->bitmask & EBT_IP_DEST) &&
-+	   FWINV((((*skb).nh.iph)->daddr & info->dmsk) !=
-+	   info->daddr, EBT_IP_DEST))
-+		return EBT_NOMATCH;
-+	return EBT_MATCH;
-+}
++  "broute", 1 << NF_BR_BROUTING, 0, sizeof(struct ebt_entries),
++  { [NF_BR_BROUTING]&initial_chain}, 0, NULL, (char *)&initial_chain
++};
 +
-+static int ebt_ip_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
++static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
 +{
-+	struct ebt_ip_info *info = (struct ebt_ip_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_ip_info)))
-+		return -EINVAL;
-+	if (e->ethproto != __constant_htons(ETH_P_IP) ||
-+	   e->invflags & EBT_IPROTO)
-+		return -EINVAL;
-+	if (info->bitmask & ~EBT_IP_MASK || info->invflags & ~EBT_IP_MASK)
-+		return -EINVAL;
-+	if (info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT)) {
-+		if (!info->bitmask & EBT_IPROTO)
-+			return -EINVAL;
-+		if (info->protocol != IPPROTO_TCP &&
-+		    info->protocol != IPPROTO_UDP)
-+			 return -EINVAL;
-+	}
-+	if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])
-+		return -EINVAL;
-+	if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1])
++	if (valid_hooks & ~(1 << NF_BR_BROUTING))
 +		return -EINVAL;
 +	return 0;
 +}
 +
-+static struct ebt_match filter_ip =
++static struct ebt_table broute_table =
 +{
-+	{NULL, NULL}, EBT_IP_MATCH, ebt_filter_ip, ebt_ip_check, NULL,
-+	THIS_MODULE
++  {NULL, NULL}, "broute", &initial_table, 1 << NF_BR_BROUTING,
++  RW_LOCK_UNLOCKED, check, NULL
 +};
 +
++static int ebt_broute(struct sk_buff **pskb)
++{
++	int ret;
++
++	ret = ebt_do_table(NF_BR_BROUTING, pskb, (*pskb)->dev, NULL,
++	   &broute_table);
++	if (ret == NF_DROP)
++		return 1; // route it
++	return 0; // bridge it
++}
++
 +static int __init init(void)
 +{
-+	return ebt_register_match(&filter_ip);
++	int ret;
++
++	ret = ebt_register_table(&broute_table);
++	if (ret < 0)
++		return ret;
++	br_write_lock_bh(BR_NETPROTO_LOCK);
++	// see br_input.c
++	br_should_route_hook = ebt_broute;
++	br_write_unlock_bh(BR_NETPROTO_LOCK);
++	return ret;
 +}
 +
 +static void __exit fini(void)
 +{
-+	ebt_unregister_match(&filter_ip);
++	br_write_lock_bh(BR_NETPROTO_LOCK);
++	br_should_route_hook = NULL;
++	br_write_unlock_bh(BR_NETPROTO_LOCK);
++	ebt_unregister_table(&broute_table);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_limit.c linux/net/bridge/netfilter/ebt_limit.c
---- linux.stock/net/bridge/netfilter/ebt_limit.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_limit.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,101 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_802_3.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,74 @@
 +/*
-+ *  ebt_limit
-+ *
-+ *	Authors:
-+ *	Tom Marshall <tommy@home.tig-grr.com>
-+ *
-+ *	Mostly copied from netfilter's ipt_limit.c, see that file for explanation
++ * 802_3
 + *
-+ *  September, 2003
++ * Author:
++ * Chris Vitale csv@bluetail.com
 + *
++ * May 2003
++ * 
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_limit.h>
++#include <linux/netfilter_bridge/ebt_802_3.h>
 +#include <linux/module.h>
 +
-+#include <linux/netdevice.h>
-+#include <linux/spinlock.h>
-+
-+static spinlock_t limit_lock = SPIN_LOCK_UNLOCKED;
-+
-+#define CREDITS_PER_JIFFY 128
-+
-+static int ebt_limit_match(const struct sk_buff *skb, const struct net_device *in,
++static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *in,
 +   const struct net_device *out, const void *data, unsigned int datalen)
 +{
-+	struct ebt_limit_info *info = (struct ebt_limit_info *)data;
-+	unsigned long now = jiffies;
-+
-+	spin_lock_bh(&limit_lock);
-+	info->credit += (now - xchg(&info->prev, now)) * CREDITS_PER_JIFFY;
-+	if (info->credit > info->credit_cap)
-+		info->credit = info->credit_cap;
++	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
++	struct ebt_802_3_hdr *hdr = (struct ebt_802_3_hdr *)skb->mac.ethernet;
++	uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
 +
-+	if (info->credit >= info->cost) {
-+		/* We're not limited. */
-+		info->credit -= info->cost;
-+		spin_unlock_bh(&limit_lock);
-+		return EBT_MATCH;
++	if (info->bitmask & EBT_802_3_SAP) {
++		if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP)) 
++				return EBT_NOMATCH;
++		if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
++				return EBT_NOMATCH;
 +	}
 +
-+	spin_unlock_bh(&limit_lock);
-+	return EBT_NOMATCH;
-+}
-+
-+/* Precision saver. */
-+static u_int32_t
-+user2credits(u_int32_t user)
-+{
-+	/* If multiplying would overflow... */
-+	if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
-+		/* Divide first. */
-+		return (user / EBT_LIMIT_SCALE) * HZ * CREDITS_PER_JIFFY;
-+
-+	return (user * HZ * CREDITS_PER_JIFFY) / EBT_LIMIT_SCALE;
-+}
-+
-+static int ebt_limit_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
-+{
-+	struct ebt_limit_info *info = (struct ebt_limit_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_limit_info)))
-+		return -EINVAL;
-+
-+	/* Check for overflow. */
-+	if (info->burst == 0
-+	    || user2credits(info->avg * info->burst) < user2credits(info->avg)) {
-+		printk("Overflow in ebt_limit: %u/%u\n",
-+			info->avg, info->burst);
-+		return -EINVAL;
++	if (info->bitmask & EBT_802_3_TYPE) {
++		if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
++			return EBT_NOMATCH;
++		if (FWINV(info->type != type, EBT_802_3_TYPE)) 
++			return EBT_NOMATCH;
 +	}
 +
-+	/* User avg in seconds * EBT_LIMIT_SCALE: convert to jiffies * 128. */
-+	info->prev = jiffies;
-+	info->credit = user2credits(info->avg * info->burst);
-+	info->credit_cap = user2credits(info->avg * info->burst);
-+	info->cost = user2credits(info->avg);
-+	return 0;
-+}
-+
-+static struct ebt_match ebt_limit_reg =
-+{
-+	{NULL, NULL}, EBT_LIMIT_MATCH, ebt_limit_match, ebt_limit_check, NULL,
-+	THIS_MODULE
-+};
-+
-+static int __init init(void)
-+{
-+	return ebt_register_match(&ebt_limit_reg);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_match(&ebt_limit_reg);
++	return EBT_MATCH;
 +}
 +
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_log.c linux/net/bridge/netfilter/ebt_log.c
---- linux.stock/net/bridge/netfilter/ebt_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_log.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,152 @@
-+/*
-+ *  ebt_log
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *
-+ *  April, 2002
-+ *
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_log.h>
-+#include <linux/module.h>
-+#include <linux/ip.h>
-+#include <linux/in.h>
-+#include <linux/if_arp.h>
-+#include <linux/spinlock.h>
-+
-+static spinlock_t ebt_log_lock = SPIN_LOCK_UNLOCKED;
-+
-+static int ebt_log_check(const char *tablename, unsigned int hookmask,
++static struct ebt_match filter_802_3;
++static int ebt_802_3_check(const char *tablename, unsigned int hookmask,
 +   const struct ebt_entry *e, void *data, unsigned int datalen)
 +{
-+	struct ebt_log_info *info = (struct ebt_log_info *)data;
++	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
 +
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_log_info)))
-+		return -EINVAL;
-+	if (info->bitmask & ~EBT_LOG_MASK)
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_802_3_info)))
 +		return -EINVAL;
-+	if (info->loglevel >= 8)
++	if (info->bitmask & ~EBT_802_3_MASK || info->invflags & ~EBT_802_3_MASK)
 +		return -EINVAL;
-+	info->prefix[EBT_LOG_PREFIX_SIZE - 1] = '\0';
-+	return 0;
-+}
-+
-+struct tcpudphdr
-+{
-+	uint16_t src;
-+	uint16_t dst;
-+};
-+
-+struct arppayload
-+{
-+	unsigned char mac_src[ETH_ALEN];
-+	unsigned char ip_src[4];
-+	unsigned char mac_dst[ETH_ALEN];
-+	unsigned char ip_dst[4];
-+};
-+
-+static void print_MAC(unsigned char *p)
-+{
-+	int i;
-+
-+	for (i = 0; i < ETH_ALEN; i++, p++)
-+		printk("%02x%c", *p, i == ETH_ALEN - 1 ? ' ':':');
-+}
-+
-+#define myNIPQUAD(a) a[0], a[1], a[2], a[3]
-+static void ebt_log(const struct sk_buff *skb, const struct net_device *in,
-+   const struct net_device *out, const void *data, unsigned int datalen)
-+{
-+	struct ebt_log_info *info = (struct ebt_log_info *)data;
-+	char level_string[4] = "< >";
-+	level_string[1] = '0' + info->loglevel;
 +
-+	spin_lock_bh(&ebt_log_lock);
-+	printk(level_string);
-+	printk("%s IN=%s OUT=%s ", info->prefix, in ? in->name : "",
-+	   out ? out->name : "");
-+
-+	printk("MAC source = ");
-+	print_MAC((skb->mac.ethernet)->h_source);
-+	printk("MAC dest = ");
-+	print_MAC((skb->mac.ethernet)->h_dest);
-+
-+	printk("proto = 0x%04x", ntohs(((*skb).mac.ethernet)->h_proto));
-+
-+	if ((info->bitmask & EBT_LOG_IP) && skb->mac.ethernet->h_proto ==
-+	   htons(ETH_P_IP)){
-+		struct iphdr *iph = skb->nh.iph;
-+		printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,",
-+		   NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		printk(" IP tos=0x%02X, IP proto=%d", iph->tos, iph->protocol);
-+		if (iph->protocol == IPPROTO_TCP ||
-+		    iph->protocol == IPPROTO_UDP) {
-+			struct tcpudphdr *ports = (struct tcpudphdr *)(skb->data + iph->ihl*4);
-+
-+			if (skb->data + iph->ihl*4 > skb->tail) {
-+				printk(" INCOMPLETE TCP/UDP header");
-+				goto out;
-+			}
-+			printk(" SPT=%u DPT=%u", ntohs(ports->src),
-+			   ntohs(ports->dst));
-+		}
-+		goto out;
-+	}
-+
-+	if ((info->bitmask & EBT_LOG_ARP) &&
-+	    ((skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) ||
-+	    (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_RARP)))) {
-+		struct arphdr * arph = skb->nh.arph;
-+		printk(" ARP HTYPE=%d, PTYPE=0x%04x, OPCODE=%d",
-+		   ntohs(arph->ar_hrd), ntohs(arph->ar_pro),
-+		   ntohs(arph->ar_op));
-+		/* If it's for Ethernet and the lengths are OK,
-+		 * then log the ARP payload */
-+		if (arph->ar_hrd == __constant_htons(1) &&
-+		    arph->ar_hln == ETH_ALEN &&
-+		    arph->ar_pln == sizeof(uint32_t)) {
-+			struct arppayload *arpp = (struct arppayload *)(skb->data + sizeof(*arph));
-+
-+			if (skb->data + sizeof(*arph) > skb->tail) {
-+				printk(" INCOMPLETE ARP header");
-+				goto out;
-+			}
-+
-+			printk(" ARP MAC SRC=");
-+			print_MAC(arpp->mac_src);
-+			printk(" ARP IP SRC=%u.%u.%u.%u",
-+			       myNIPQUAD(arpp->ip_src));
-+			printk(" ARP MAC DST=");
-+			print_MAC(arpp->mac_dst);
-+			printk(" ARP IP DST=%u.%u.%u.%u",
-+			       myNIPQUAD(arpp->ip_dst));
-+		}
-+
-+	}
-+out:
-+	printk("\n");
-+	spin_unlock_bh(&ebt_log_lock);
++	return 0;
 +}
 +
-+static struct ebt_watcher log =
++static struct ebt_match filter_802_3 =
 +{
-+	{NULL, NULL}, EBT_LOG_WATCHER, ebt_log, ebt_log_check, NULL,
-+	THIS_MODULE
++	.name		= EBT_802_3_MATCH,
++	.match		= ebt_filter_802_3,
++	.check		= ebt_802_3_check,
++	.me		= THIS_MODULE,
 +};
 +
 +static int __init init(void)
 +{
-+	return ebt_register_watcher(&log);
++	return ebt_register_match(&filter_802_3);
 +}
 +
 +static void __exit fini(void)
 +{
-+	ebt_unregister_watcher(&log);
++	ebt_unregister_match(&filter_802_3);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark.c linux/net/bridge/netfilter/ebt_mark.c
---- linux.stock/net/bridge/netfilter/ebt_mark.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_mark.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_mark.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,66 @@
 +/*
 + *  ebt_mark
@@ -3345,9 +853,8 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark.c linux/net/bridge/netfilte
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark_m.c linux/net/bridge/netfilter/ebt_mark_m.c
---- linux.stock/net/bridge/netfilter/ebt_mark_m.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_mark_m.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_mark_m.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,61 @@
 +/*
 + *  ebt_mark_m
@@ -3410,9 +917,8 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark_m.c linux/net/bridge/netfil
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_pkttype.c linux/net/bridge/netfilter/ebt_pkttype.c
---- linux.stock/net/bridge/netfilter/ebt_pkttype.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_pkttype.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_pkttype.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,60 @@
 +/*
 + *  ebt_pkttype
@@ -3474,152 +980,8 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebt_pkttype.c linux/net/bridge/netfi
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_redirect.c linux/net/bridge/netfilter/ebt_redirect.c
---- linux.stock/net/bridge/netfilter/ebt_redirect.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_redirect.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,71 @@
-+/*
-+ *  ebt_redirect
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *
-+ *  April, 2002
-+ *
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_redirect.h>
-+#include <linux/module.h>
-+#include <net/sock.h>
-+#include "../br_private.h"
-+
-+static int ebt_target_redirect(struct sk_buff **pskb, unsigned int hooknr,
-+   const struct net_device *in, const struct net_device *out,
-+   const void *data, unsigned int datalen)
-+{
-+	struct ebt_redirect_info *info = (struct ebt_redirect_info *)data;
-+
-+	if (hooknr != NF_BR_BROUTING)
-+		memcpy((**pskb).mac.ethernet->h_dest,
-+		   in->br_port->br->dev.dev_addr, ETH_ALEN);
-+	else {
-+		memcpy((**pskb).mac.ethernet->h_dest,
-+		   in->dev_addr, ETH_ALEN);
-+		(*pskb)->pkt_type = PACKET_HOST;
-+	}
-+	return info->target;
-+}
-+
-+static int ebt_target_redirect_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
-+{
-+	struct ebt_redirect_info *info = (struct ebt_redirect_info *)data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_redirect_info)))
-+		return -EINVAL;
-+	if (BASE_CHAIN && info->target == EBT_RETURN)
-+		return -EINVAL;
-+	CLEAR_BASE_CHAIN_BIT;
-+	if ( (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING)) &&
-+	     (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) )
-+		return -EINVAL;
-+	if (INVALID_TARGET)
-+		return -EINVAL;
-+	return 0;
-+}
-+
-+static struct ebt_target redirect_target =
-+{
-+	{NULL, NULL}, EBT_REDIRECT_TARGET, ebt_target_redirect,
-+	ebt_target_redirect_check, NULL, THIS_MODULE
-+};
-+
-+static int __init init(void)
-+{
-+	return ebt_register_target(&redirect_target);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_target(&redirect_target);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_snat.c linux/net/bridge/netfilter/ebt_snat.c
---- linux.stock/net/bridge/netfilter/ebt_snat.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_snat.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,64 @@
-+/*
-+ *  ebt_snat
-+ *
-+ *	Authors:
-+ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
-+ *
-+ *  June, 2002
-+ *
-+ */
-+
-+#include <linux/netfilter_bridge/ebtables.h>
-+#include <linux/netfilter_bridge/ebt_nat.h>
-+#include <linux/module.h>
-+
-+static int ebt_target_snat(struct sk_buff **pskb, unsigned int hooknr,
-+   const struct net_device *in, const struct net_device *out,
-+   const void *data, unsigned int datalen)
-+{
-+	struct ebt_nat_info *info = (struct ebt_nat_info *) data;
-+
-+	memcpy(((**pskb).mac.ethernet)->h_source, info->mac,
-+	   ETH_ALEN * sizeof(unsigned char));
-+	return info->target;
-+}
-+
-+static int ebt_target_snat_check(const char *tablename, unsigned int hookmask,
-+   const struct ebt_entry *e, void *data, unsigned int datalen)
-+{
-+	struct ebt_nat_info *info = (struct ebt_nat_info *) data;
-+
-+	if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info)))
-+		return -EINVAL;
-+	if (BASE_CHAIN && info->target == EBT_RETURN)
-+		return -EINVAL;
-+	CLEAR_BASE_CHAIN_BIT;
-+	if (strcmp(tablename, "nat"))
-+		return -EINVAL;
-+	if (hookmask & ~(1 << NF_BR_POST_ROUTING))
-+		return -EINVAL;
-+	if (INVALID_TARGET)
-+		return -EINVAL;
-+	return 0;
-+}
-+
-+static struct ebt_target snat =
-+{
-+	{NULL, NULL}, EBT_SNAT_TARGET, ebt_target_snat, ebt_target_snat_check,
-+	NULL, THIS_MODULE
-+};
-+
-+static int __init init(void)
-+{
-+	return ebt_register_target(&snat);
-+}
-+
-+static void __exit fini(void)
-+{
-+	ebt_unregister_target(&snat);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+EXPORT_NO_SYMBOLS;
-+MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_stp.c linux/net/bridge/netfilter/ebt_stp.c
---- linux.stock/net/bridge/netfilter/ebt_stp.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_stp.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_stp.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,191 @@
 +/*
 + *  ebt_stp
@@ -3812,9 +1174,358 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebt_stp.c linux/net/bridge/netfilter
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebt_vlan.c linux/net/bridge/netfilter/ebt_vlan.c
---- linux.stock/net/bridge/netfilter/ebt_vlan.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebt_vlan.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_redirect.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,71 @@
++/*
++ *  ebt_redirect
++ *
++ *	Authors:
++ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
++ *
++ *  April, 2002
++ *
++ */
++
++#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_redirect.h>
++#include <linux/module.h>
++#include <net/sock.h>
++#include "../br_private.h"
++
++static int ebt_target_redirect(struct sk_buff **pskb, unsigned int hooknr,
++   const struct net_device *in, const struct net_device *out,
++   const void *data, unsigned int datalen)
++{
++	struct ebt_redirect_info *info = (struct ebt_redirect_info *)data;
++
++	if (hooknr != NF_BR_BROUTING)
++		memcpy((**pskb).mac.ethernet->h_dest,
++		   in->br_port->br->dev.dev_addr, ETH_ALEN);
++	else {
++		memcpy((**pskb).mac.ethernet->h_dest,
++		   in->dev_addr, ETH_ALEN);
++		(*pskb)->pkt_type = PACKET_HOST;
++	}
++	return info->target;
++}
++
++static int ebt_target_redirect_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
++{
++	struct ebt_redirect_info *info = (struct ebt_redirect_info *)data;
++
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_redirect_info)))
++		return -EINVAL;
++	if (BASE_CHAIN && info->target == EBT_RETURN)
++		return -EINVAL;
++	CLEAR_BASE_CHAIN_BIT;
++	if ( (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING)) &&
++	     (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) )
++		return -EINVAL;
++	if (INVALID_TARGET)
++		return -EINVAL;
++	return 0;
++}
++
++static struct ebt_target redirect_target =
++{
++	{NULL, NULL}, EBT_REDIRECT_TARGET, ebt_target_redirect,
++	ebt_target_redirect_check, NULL, THIS_MODULE
++};
++
++static int __init init(void)
++{
++	return ebt_register_target(&redirect_target);
++}
++
++static void __exit fini(void)
++{
++	ebt_unregister_target(&redirect_target);
++}
++
++module_init(init);
++module_exit(fini);
++EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_arp.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,149 @@
++/*
++ *  ebt_arp
++ *
++ *	Authors:
++ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
++ *	Tim Gardner <timg@tpi.com>
++ *
++ *  April, 2002
++ *
++ */
++
++#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_arp.h>
++#include <linux/if_arp.h>
++#include <linux/if_ether.h>
++#include <linux/module.h>
++
++static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in,
++   const struct net_device *out, const void *data, unsigned int datalen)
++{
++	struct ebt_arp_info *info = (struct ebt_arp_info *)data;
++
++	if (info->bitmask & EBT_ARP_OPCODE && FWINV(info->opcode !=
++	   ((*skb).nh.arph)->ar_op, EBT_ARP_OPCODE))
++		return EBT_NOMATCH;
++	if (info->bitmask & EBT_ARP_HTYPE && FWINV(info->htype !=
++	   ((*skb).nh.arph)->ar_hrd, EBT_ARP_HTYPE))
++		return EBT_NOMATCH;
++	if (info->bitmask & EBT_ARP_PTYPE && FWINV(info->ptype !=
++	   ((*skb).nh.arph)->ar_pro, EBT_ARP_PTYPE))
++		return EBT_NOMATCH;
++
++	if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP))
++	{
++		uint32_t arp_len = sizeof(struct arphdr) +
++		   (2 * (((*skb).nh.arph)->ar_hln)) +
++		   (2 * (((*skb).nh.arph)->ar_pln));
++		uint32_t dst;
++		uint32_t src;
++
++		// Make sure the packet is long enough.
++		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
++			return EBT_NOMATCH;
++		// IPv4 addresses are always 4 bytes.
++		if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t))
++			return EBT_NOMATCH;
++
++		if (info->bitmask & EBT_ARP_SRC_IP) {
++			memcpy(&src, ((*skb).nh.raw) + sizeof(struct arphdr) +
++			   ((*skb).nh.arph)->ar_hln, sizeof(uint32_t));
++			if (FWINV(info->saddr != (src & info->smsk),
++			   EBT_ARP_SRC_IP))
++				return EBT_NOMATCH;
++		}
++
++		if (info->bitmask & EBT_ARP_DST_IP) {
++			memcpy(&dst, ((*skb).nh.raw)+sizeof(struct arphdr) +
++			   (2*(((*skb).nh.arph)->ar_hln)) +
++			   (((*skb).nh.arph)->ar_pln), sizeof(uint32_t));
++			if (FWINV(info->daddr != (dst & info->dmsk),
++			   EBT_ARP_DST_IP))
++				return EBT_NOMATCH;
++		}
++	}
++
++	if (info->bitmask & (EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC))
++	{
++		uint32_t arp_len = sizeof(struct arphdr) +
++		   (2 * (((*skb).nh.arph)->ar_hln)) +
++		   (2 * (((*skb).nh.arph)->ar_pln));
++		unsigned char dst[ETH_ALEN];
++		unsigned char src[ETH_ALEN];
++
++		// Make sure the packet is long enough.
++		if ((((*skb).nh.raw) + arp_len) > (*skb).tail)
++			return EBT_NOMATCH;
++		// MAC addresses are 6 bytes.
++		if (((*skb).nh.arph)->ar_hln != ETH_ALEN)
++			return EBT_NOMATCH;
++		if (info->bitmask & EBT_ARP_SRC_MAC) {
++			uint8_t verdict, i;
++
++			memcpy(&src, ((*skb).nh.raw) +
++					sizeof(struct arphdr),
++					ETH_ALEN);
++			verdict = 0;
++			for (i = 0; i < 6; i++)
++				verdict |= (src[i] ^ info->smaddr[i]) &
++				       info->smmsk[i];	
++			if (FWINV(verdict != 0, EBT_ARP_SRC_MAC))
++				return EBT_NOMATCH;
++		}
++
++		if (info->bitmask & EBT_ARP_DST_MAC) { 
++			uint8_t verdict, i;
++
++			memcpy(&dst, ((*skb).nh.raw) +
++					sizeof(struct arphdr) +
++			   		(((*skb).nh.arph)->ar_hln) +
++			   		(((*skb).nh.arph)->ar_pln),
++					ETH_ALEN);
++			verdict = 0;
++			for (i = 0; i < 6; i++)
++				verdict |= (dst[i] ^ info->dmaddr[i]) &
++					info->dmmsk[i];
++			if (FWINV(verdict != 0, EBT_ARP_DST_MAC))
++				return EBT_NOMATCH;
++		}
++	}
++
++	return EBT_MATCH;
++}
++
++static int ebt_arp_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
++{
++	struct ebt_arp_info *info = (struct ebt_arp_info *)data;
++
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_arp_info)))
++		return -EINVAL;
++	if ((e->ethproto != __constant_htons(ETH_P_ARP) &&
++	   e->ethproto != __constant_htons(ETH_P_RARP)) ||
++	   e->invflags & EBT_IPROTO)
++		return -EINVAL;
++	if (info->bitmask & ~EBT_ARP_MASK || info->invflags & ~EBT_ARP_MASK)
++		return -EINVAL;
++	return 0;
++}
++
++static struct ebt_match filter_arp =
++{
++	{NULL, NULL}, EBT_ARP_MATCH, ebt_filter_arp, ebt_arp_check, NULL,
++	THIS_MODULE
++};
++
++static int __init init(void)
++{
++	return ebt_register_match(&filter_arp);
++}
++
++static void __exit fini(void)
++{
++	ebt_unregister_match(&filter_arp);
++}
++
++module_init(init);
++module_exit(fini);
++EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_ip.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,121 @@
++/*
++ *  ebt_ip
++ *
++ *	Authors:
++ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
++ *
++ *  April, 2002
++ *
++ *  Changes:
++ *    added ip-sport and ip-dport
++ *    Innominate Security Technologies AG <mhopf@innominate.com>
++ *    September, 2002
++ */
++
++#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_ip.h>
++#include <linux/ip.h>
++#include <linux/in.h>
++#include <linux/module.h>
++
++struct tcpudphdr {
++	uint16_t src;
++	uint16_t dst;
++};
++
++union h_u {
++	unsigned char *raw;
++	struct tcpudphdr *tuh;
++};
++
++static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,
++   const struct net_device *out, const void *data,
++   unsigned int datalen)
++{
++	struct ebt_ip_info *info = (struct ebt_ip_info *)data;
++
++	if (info->bitmask & EBT_IP_TOS &&
++	   FWINV(info->tos != ((*skb).nh.iph)->tos, EBT_IP_TOS))
++		return EBT_NOMATCH;
++	if (info->bitmask & EBT_IP_PROTO) {
++		if (FWINV(info->protocol != ((*skb).nh.iph)->protocol,
++		          EBT_IP_PROTO))
++			return EBT_NOMATCH;
++		if ( info->protocol == IPPROTO_TCP ||
++		     info->protocol == IPPROTO_UDP )
++		{
++			union h_u h;
++			h.raw = skb->data + skb->nh.iph->ihl*4;
++			if (info->bitmask & EBT_IP_DPORT) {
++				uint16_t port = ntohs(h.tuh->dst);
++				if (FWINV(port < info->dport[0] ||
++				          port > info->dport[1],
++				          EBT_IP_DPORT))
++				return EBT_NOMATCH;
++			}
++			if (info->bitmask & EBT_IP_SPORT) {
++				uint16_t port = ntohs(h.tuh->src);
++				if (FWINV(port < info->sport[0] ||
++				          port > info->sport[1],
++				          EBT_IP_SPORT))
++				return EBT_NOMATCH;
++			}
++		}
++	}
++	if (info->bitmask & EBT_IP_SOURCE &&
++	   FWINV((((*skb).nh.iph)->saddr & info->smsk) !=
++	   info->saddr, EBT_IP_SOURCE))
++		return EBT_NOMATCH;
++	if ((info->bitmask & EBT_IP_DEST) &&
++	   FWINV((((*skb).nh.iph)->daddr & info->dmsk) !=
++	   info->daddr, EBT_IP_DEST))
++		return EBT_NOMATCH;
++	return EBT_MATCH;
++}
++
++static int ebt_ip_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
++{
++	struct ebt_ip_info *info = (struct ebt_ip_info *)data;
++
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_ip_info)))
++		return -EINVAL;
++	if (e->ethproto != __constant_htons(ETH_P_IP) ||
++	   e->invflags & EBT_IPROTO)
++		return -EINVAL;
++	if (info->bitmask & ~EBT_IP_MASK || info->invflags & ~EBT_IP_MASK)
++		return -EINVAL;
++	if (info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT)) {
++		if (!info->bitmask & EBT_IPROTO)
++			return -EINVAL;
++		if (info->protocol != IPPROTO_TCP &&
++		    info->protocol != IPPROTO_UDP)
++			 return -EINVAL;
++	}
++	if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])
++		return -EINVAL;
++	if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1])
++		return -EINVAL;
++	return 0;
++}
++
++static struct ebt_match filter_ip =
++{
++	{NULL, NULL}, EBT_IP_MATCH, ebt_filter_ip, ebt_ip_check, NULL,
++	THIS_MODULE
++};
++
++static int __init init(void)
++{
++	return ebt_register_match(&filter_ip);
++}
++
++static void __exit fini(void)
++{
++	ebt_unregister_match(&filter_ip);
++}
++
++module_init(init);
++module_exit(fini);
++EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_vlan.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,259 @@
 +/*
 + * Description: EBTables 802.1Q match extension kernelspace module.
@@ -4075,286 +1786,298 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebt_vlan.c linux/net/bridge/netfilte
 +module_exit(fini);
 +
 +EXPORT_NO_SYMBOLS;
-diff -Nurb linux.stock/net/bridge/netfilter/ebtable_broute.c linux/net/bridge/netfilter/ebtable_broute.c
---- linux.stock/net/bridge/netfilter/ebtable_broute.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebtable_broute.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,79 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_log.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,152 @@
 +/*
-+ *  ebtable_broute
++ *  ebt_log
 + *
 + *	Authors:
 + *	Bart De Schuymer <bart.de.schuymer@pandora.be>
 + *
 + *  April, 2002
 + *
-+ *  This table lets you choose between routing and bridging for frames
-+ *  entering on a bridge enslaved nic. This table is traversed before any
-+ *  other ebtables table. See net/bridge/br_input.c.
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_log.h>
 +#include <linux/module.h>
-+#include <linux/if_bridge.h>
-+#include <linux/brlock.h>
++#include <linux/ip.h>
++#include <linux/in.h>
++#include <linux/if_arp.h>
++#include <linux/spinlock.h>
 +
-+// EBT_ACCEPT means the frame will be bridged
-+// EBT_DROP means the frame will be routed
-+static struct ebt_entries initial_chain =
-+  {0, "BROUTING", 0, EBT_ACCEPT, 0};
++static spinlock_t ebt_log_lock = SPIN_LOCK_UNLOCKED;
 +
-+static struct ebt_replace initial_table =
++static int ebt_log_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
 +{
-+  "broute", 1 << NF_BR_BROUTING, 0, sizeof(struct ebt_entries),
-+  { [NF_BR_BROUTING]&initial_chain}, 0, NULL, (char *)&initial_chain
-+};
++	struct ebt_log_info *info = (struct ebt_log_info *)data;
 +
-+static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
-+{
-+	if (valid_hooks & ~(1 << NF_BR_BROUTING))
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_log_info)))
 +		return -EINVAL;
++	if (info->bitmask & ~EBT_LOG_MASK)
++		return -EINVAL;
++	if (info->loglevel >= 8)
++		return -EINVAL;
++	info->prefix[EBT_LOG_PREFIX_SIZE - 1] = '\0';
 +	return 0;
 +}
 +
-+static struct ebt_table broute_table =
++struct tcpudphdr
 +{
-+  {NULL, NULL}, "broute", &initial_table, 1 << NF_BR_BROUTING,
-+  RW_LOCK_UNLOCKED, check, NULL
++	uint16_t src;
++	uint16_t dst;
 +};
 +
-+static int ebt_broute(struct sk_buff **pskb)
++struct arppayload
 +{
-+	int ret;
++	unsigned char mac_src[ETH_ALEN];
++	unsigned char ip_src[4];
++	unsigned char mac_dst[ETH_ALEN];
++	unsigned char ip_dst[4];
++};
 +
-+	ret = ebt_do_table(NF_BR_BROUTING, pskb, (*pskb)->dev, NULL,
-+	   &broute_table);
-+	if (ret == NF_DROP)
-+		return 1; // route it
-+	return 0; // bridge it
++static void print_MAC(unsigned char *p)
++{
++	int i;
++
++	for (i = 0; i < ETH_ALEN; i++, p++)
++		printk("%02x%c", *p, i == ETH_ALEN - 1 ? ' ':':');
 +}
 +
-+static int __init init(void)
++#define myNIPQUAD(a) a[0], a[1], a[2], a[3]
++static void ebt_log(const struct sk_buff *skb, const struct net_device *in,
++   const struct net_device *out, const void *data, unsigned int datalen)
 +{
-+	int ret;
++	struct ebt_log_info *info = (struct ebt_log_info *)data;
++	char level_string[4] = "< >";
++	level_string[1] = '0' + info->loglevel;
 +
-+	ret = ebt_register_table(&broute_table);
-+	if (ret < 0)
-+		return ret;
-+	br_write_lock_bh(BR_NETPROTO_LOCK);
-+	// see br_input.c
-+	br_should_route_hook = ebt_broute;
-+	br_write_unlock_bh(BR_NETPROTO_LOCK);
-+	return ret;
++	spin_lock_bh(&ebt_log_lock);
++	printk(level_string);
++	printk("%s IN=%s OUT=%s ", info->prefix, in ? in->name : "",
++	   out ? out->name : "");
++
++	printk("MAC source = ");
++	print_MAC((skb->mac.ethernet)->h_source);
++	printk("MAC dest = ");
++	print_MAC((skb->mac.ethernet)->h_dest);
++
++	printk("proto = 0x%04x", ntohs(((*skb).mac.ethernet)->h_proto));
++
++	if ((info->bitmask & EBT_LOG_IP) && skb->mac.ethernet->h_proto ==
++	   htons(ETH_P_IP)){
++		struct iphdr *iph = skb->nh.iph;
++		printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,",
++		   NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
++		printk(" IP tos=0x%02X, IP proto=%d", iph->tos, iph->protocol);
++		if (iph->protocol == IPPROTO_TCP ||
++		    iph->protocol == IPPROTO_UDP) {
++			struct tcpudphdr *ports = (struct tcpudphdr *)(skb->data + iph->ihl*4);
++
++			if (skb->data + iph->ihl*4 > skb->tail) {
++				printk(" INCOMPLETE TCP/UDP header");
++				goto out;
++			}
++			printk(" SPT=%u DPT=%u", ntohs(ports->src),
++			   ntohs(ports->dst));
++		}
++		goto out;
++	}
++
++	if ((info->bitmask & EBT_LOG_ARP) &&
++	    ((skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) ||
++	    (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_RARP)))) {
++		struct arphdr * arph = skb->nh.arph;
++		printk(" ARP HTYPE=%d, PTYPE=0x%04x, OPCODE=%d",
++		   ntohs(arph->ar_hrd), ntohs(arph->ar_pro),
++		   ntohs(arph->ar_op));
++		/* If it's for Ethernet and the lengths are OK,
++		 * then log the ARP payload */
++		if (arph->ar_hrd == __constant_htons(1) &&
++		    arph->ar_hln == ETH_ALEN &&
++		    arph->ar_pln == sizeof(uint32_t)) {
++			struct arppayload *arpp = (struct arppayload *)(skb->data + sizeof(*arph));
++
++			if (skb->data + sizeof(*arph) > skb->tail) {
++				printk(" INCOMPLETE ARP header");
++				goto out;
++			}
++
++			printk(" ARP MAC SRC=");
++			print_MAC(arpp->mac_src);
++			printk(" ARP IP SRC=%u.%u.%u.%u",
++			       myNIPQUAD(arpp->ip_src));
++			printk(" ARP MAC DST=");
++			print_MAC(arpp->mac_dst);
++			printk(" ARP IP DST=%u.%u.%u.%u",
++			       myNIPQUAD(arpp->ip_dst));
++		}
++
++	}
++out:
++	printk("\n");
++	spin_unlock_bh(&ebt_log_lock);
++}
++
++static struct ebt_watcher log =
++{
++	{NULL, NULL}, EBT_LOG_WATCHER, ebt_log, ebt_log_check, NULL,
++	THIS_MODULE
++};
++
++static int __init init(void)
++{
++	return ebt_register_watcher(&log);
 +}
 +
 +static void __exit fini(void)
 +{
-+	br_write_lock_bh(BR_NETPROTO_LOCK);
-+	br_should_route_hook = NULL;
-+	br_write_unlock_bh(BR_NETPROTO_LOCK);
-+	ebt_unregister_table(&broute_table);
++	ebt_unregister_watcher(&log);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebtable_filter.c linux/net/bridge/netfilter/ebtable_filter.c
---- linux.stock/net/bridge/netfilter/ebtable_filter.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebtable_filter.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,90 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_snat.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,64 @@
 +/*
-+ *  ebtable_filter
++ *  ebt_snat
 + *
 + *	Authors:
 + *	Bart De Schuymer <bart.de.schuymer@pandora.be>
 + *
-+ *  April, 2002
++ *  June, 2002
 + *
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_nat.h>
 +#include <linux/module.h>
 +
-+#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
-+   (1 << NF_BR_LOCAL_OUT))
-+
-+static struct ebt_entries initial_chains[] =
++static int ebt_target_snat(struct sk_buff **pskb, unsigned int hooknr,
++   const struct net_device *in, const struct net_device *out,
++   const void *data, unsigned int datalen)
 +{
-+  {0, "INPUT", 0, EBT_ACCEPT, 0},
-+  {0, "FORWARD", 0, EBT_ACCEPT, 0},
-+  {0, "OUTPUT", 0, EBT_ACCEPT, 0}
-+};
++	struct ebt_nat_info *info = (struct ebt_nat_info *) data;
 +
-+static struct ebt_replace initial_table =
-+{
-+  "filter", FILTER_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries),
-+  { [NF_BR_LOCAL_IN]&initial_chains[0], [NF_BR_FORWARD]&initial_chains[1],
-+    [NF_BR_LOCAL_OUT]&initial_chains[2] }, 0, NULL, (char *)initial_chains
-+};
++	memcpy(((**pskb).mac.ethernet)->h_source, info->mac,
++	   ETH_ALEN * sizeof(unsigned char));
++	return info->target;
++}
 +
-+static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
++static int ebt_target_snat_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
 +{
-+	if (valid_hooks & ~FILTER_VALID_HOOKS)
++	struct ebt_nat_info *info = (struct ebt_nat_info *) data;
++
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info)))
++		return -EINVAL;
++	if (BASE_CHAIN && info->target == EBT_RETURN)
++		return -EINVAL;
++	CLEAR_BASE_CHAIN_BIT;
++	if (strcmp(tablename, "nat"))
++		return -EINVAL;
++	if (hookmask & ~(1 << NF_BR_POST_ROUTING))
++		return -EINVAL;
++	if (INVALID_TARGET)
 +		return -EINVAL;
 +	return 0;
 +}
 +
-+static struct ebt_table frame_filter =
-+{ 
-+  {NULL, NULL}, "filter", &initial_table, FILTER_VALID_HOOKS, 
-+  RW_LOCK_UNLOCKED, check, NULL
-+};
-+
-+static unsigned int
-+ebt_hook (unsigned int hook, struct sk_buff **pskb, const struct net_device *in,
-+   const struct net_device *out, int (*okfn)(struct sk_buff *))
++static struct ebt_target snat =
 +{
-+	return ebt_do_table(hook, pskb, in, out, &frame_filter);
-+}
-+
-+static struct nf_hook_ops ebt_ops_filter[] = {
-+	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_IN,
-+	   NF_BR_PRI_FILTER_BRIDGED},
-+	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_FORWARD,
-+	   NF_BR_PRI_FILTER_BRIDGED},
-+	{ { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_OUT,
-+	   NF_BR_PRI_FILTER_OTHER}
++	{NULL, NULL}, EBT_SNAT_TARGET, ebt_target_snat, ebt_target_snat_check,
++	NULL, THIS_MODULE
 +};
 +
 +static int __init init(void)
 +{
-+	int i, j, ret;
-+
-+	ret = ebt_register_table(&frame_filter);
-+	if (ret < 0)
-+		return ret;
-+	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
-+		if ((ret = nf_register_hook(&ebt_ops_filter[i])) < 0)
-+			goto cleanup;
-+	return ret;
-+cleanup:
-+	for (j = 0; j < i; j++)
-+		nf_unregister_hook(&ebt_ops_filter[j]);
-+	ebt_unregister_table(&frame_filter);
-+	return ret;
++	return ebt_register_target(&snat);
 +}
 +
 +static void __exit fini(void)
 +{
-+	int i;
-+
-+	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
-+		nf_unregister_hook(&ebt_ops_filter[i]);
-+	ebt_unregister_table(&frame_filter);
++	ebt_unregister_target(&snat);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebtable_nat.c linux/net/bridge/netfilter/ebtable_nat.c
---- linux.stock/net/bridge/netfilter/ebtable_nat.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebtable_nat.c	2004-07-10 23:46:39.000000000 -0400
-@@ -0,0 +1,96 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebt_dnat.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,65 @@
 +/*
-+ *  ebtable_nat
++ *  ebt_dnat
 + *
 + *	Authors:
 + *	Bart De Schuymer <bart.de.schuymer@pandora.be>
 + *
-+ *  April, 2002
++ *  June, 2002
 + *
 + */
 +
 +#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_nat.h>
 +#include <linux/module.h>
-+#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
-+   (1 << NF_BR_POST_ROUTING))
-+
-+static struct ebt_entries initial_chains[] =
-+{
-+  {0, "PREROUTING", 0, EBT_ACCEPT, 0},
-+  {0, "OUTPUT", 0, EBT_ACCEPT, 0},
-+  {0, "POSTROUTING", 0, EBT_ACCEPT, 0}
-+};
++#include <net/sock.h>
 +
-+static struct ebt_replace initial_table =
++static int ebt_target_dnat(struct sk_buff **pskb, unsigned int hooknr,
++   const struct net_device *in, const struct net_device *out,
++   const void *data, unsigned int datalen)
 +{
-+  "nat", NAT_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries),
-+  { [NF_BR_PRE_ROUTING]&initial_chains[0], [NF_BR_LOCAL_OUT]&initial_chains[1],
-+    [NF_BR_POST_ROUTING]&initial_chains[2] }, 0, NULL, (char *)initial_chains
-+};
++	struct ebt_nat_info *info = (struct ebt_nat_info *)data;
 +
-+static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
-+{
-+	if (valid_hooks & ~NAT_VALID_HOOKS)
-+		return -EINVAL;
-+	return 0;
++	memcpy(((**pskb).mac.ethernet)->h_dest, info->mac,
++	   ETH_ALEN * sizeof(unsigned char));
++	return info->target;
 +}
 +
-+static struct ebt_table frame_nat =
++static int ebt_target_dnat_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
 +{
-+  {NULL, NULL}, "nat", &initial_table, NAT_VALID_HOOKS,
-+  RW_LOCK_UNLOCKED, check, NULL
-+};
++	struct ebt_nat_info *info = (struct ebt_nat_info *)data;
 +
-+static unsigned int
-+ebt_nat_dst(unsigned int hook, struct sk_buff **pskb, const struct net_device *in
-+   , const struct net_device *out, int (*okfn)(struct sk_buff *))
-+{
-+	return ebt_do_table(hook, pskb, in, out, &frame_nat);
++	if (BASE_CHAIN && info->target == EBT_RETURN)
++		return -EINVAL;
++	CLEAR_BASE_CHAIN_BIT;
++	if ( (strcmp(tablename, "nat") ||
++	   (hookmask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT)))) &&
++	   (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) )
++		return -EINVAL;
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info)))
++		return -EINVAL;
++	if (INVALID_TARGET)
++		return -EINVAL;
++	return 0;
 +}
 +
-+static unsigned int
-+ebt_nat_src(unsigned int hook, struct sk_buff **pskb, const struct net_device *in
-+   , const struct net_device *out, int (*okfn)(struct sk_buff *))
++static struct ebt_target dnat =
 +{
-+	return ebt_do_table(hook, pskb, in, out, &frame_nat);
-+}
-+
-+static struct nf_hook_ops ebt_ops_nat[] = {
-+	{ { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_LOCAL_OUT,
-+	   NF_BR_PRI_NAT_DST_OTHER},
-+	{ { NULL, NULL }, ebt_nat_src, PF_BRIDGE, NF_BR_POST_ROUTING,
-+	   NF_BR_PRI_NAT_SRC},
-+	{ { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_PRE_ROUTING,
-+	   NF_BR_PRI_NAT_DST_BRIDGED},
++	{NULL, NULL}, EBT_DNAT_TARGET, ebt_target_dnat, ebt_target_dnat_check,
++	NULL, THIS_MODULE
 +};
 +
 +static int __init init(void)
 +{
-+	int i, ret, j;
-+
-+	ret = ebt_register_table(&frame_nat);
-+	if (ret < 0)
-+		return ret;
-+	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
-+		if ((ret = nf_register_hook(&ebt_ops_nat[i])) < 0)
-+			goto cleanup;
-+	return ret;
-+cleanup:
-+	for (j = 0; j < i; j++)
-+		nf_unregister_hook(&ebt_ops_nat[j]);
-+	ebt_unregister_table(&frame_nat);
-+	return ret;
++	return ebt_register_target(&dnat);
 +}
 +
 +static void __exit fini(void)
 +{
-+	int i;
-+
-+	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
-+		nf_unregister_hook(&ebt_ops_nat[i]);
-+	ebt_unregister_table(&frame_nat);
++	ebt_unregister_target(&dnat);
 +}
 +
 +module_init(init);
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/bridge/netfilter/ebtables.c linux/net/bridge/netfilter/ebtables.c
---- linux.stock/net/bridge/netfilter/ebtables.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/bridge/netfilter/ebtables.c	2004-07-10 23:46:39.000000000 -0400
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/netfilter/ebtables.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,1490 @@
 +/*
 + *  ebtables
@@ -5846,44 +3569,817 @@ diff -Nurb linux.stock/net/bridge/netfilter/ebtables.c linux/net/bridge/netfilte
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-diff -Nurb linux.stock/net/core/dev.c linux/net/core/dev.c
---- linux.stock/net/core/dev.c	2003-10-14 04:02:55.000000000 -0400
-+++ linux/net/core/dev.c	2004-07-10 23:46:39.000000000 -0400
-@@ -1393,7 +1393,7 @@
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebtables.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,361 @@
++/*
++ *  ebtables
++ *
++ *	Authors:
++ *	Bart De Schuymer		<bart.de.schuymer@pandora.be>
++ *
++ *  ebtables.c,v 2.0, September, 2002
++ *
++ *  This code is stongly inspired on the iptables code which is
++ *  Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
++ */
++
++#ifndef __LINUX_BRIDGE_EFF_H
++#define __LINUX_BRIDGE_EFF_H
++#include <linux/if.h>
++#include <linux/netfilter_bridge.h>
++#include <linux/if_ether.h>
++
++#define EBT_TABLE_MAXNAMELEN 32
++#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
++#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
++
++// verdicts >0 are "branches"
++#define EBT_ACCEPT   -1
++#define EBT_DROP     -2
++#define EBT_CONTINUE -3
++#define EBT_RETURN   -4
++#define NUM_STANDARD_TARGETS   4
++
++struct ebt_replace
++{
++	char name[EBT_TABLE_MAXNAMELEN];
++	unsigned int valid_hooks;
++	// nr of rules in the table
++	unsigned int nentries;
++	// total size of the entries
++	unsigned int entries_size;
++	// start of the chains
++	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
++	// nr of counters userspace expects back
++	unsigned int num_counters;
++	// where the kernel will put the old counters
++	struct ebt_counter *counters;
++	char *entries;
++};
++
++struct ebt_counter
++{
++	uint64_t pcnt;
++	uint64_t bcnt;
++};
++
++struct ebt_entries {
++	// this field is always set to zero
++	// See EBT_ENTRY_OR_ENTRIES.
++	// Must be same size as ebt_entry.bitmask
++	unsigned int distinguisher;
++	// the chain name
++	char name[EBT_CHAIN_MAXNAMELEN];
++	// counter offset for this chain
++	unsigned int counter_offset;
++	// one standard (accept, drop, return) per hook
++	int policy;
++	// nr. of entries
++	unsigned int nentries;
++	// entry list
++	char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
++};
++
++// used for the bitmask of struct ebt_entry
++
++// This is a hack to make a difference between an ebt_entry struct and an
++// ebt_entries struct when traversing the entries from start to end.
++// Using this simplifies the code alot, while still being able to use
++// ebt_entries.
++// Contrary, iptables doesn't use something like ebt_entries and therefore uses
++// different techniques for naming the policy and such. So, iptables doesn't
++// need a hack like this.
++#define EBT_ENTRY_OR_ENTRIES 0x01
++// these are the normal masks
++#define EBT_NOPROTO 0x02
++#define EBT_802_3 0x04
++#define EBT_SOURCEMAC 0x08
++#define EBT_DESTMAC 0x10
++#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \
++   | EBT_ENTRY_OR_ENTRIES)
++
++#define EBT_IPROTO 0x01
++#define EBT_IIN 0x02
++#define EBT_IOUT 0x04
++#define EBT_ISOURCE 0x8
++#define EBT_IDEST 0x10
++#define EBT_ILOGICALIN 0x20
++#define EBT_ILOGICALOUT 0x40
++#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
++   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
++
++struct ebt_entry_match
++{
++	union {
++		char name[EBT_FUNCTION_MAXNAMELEN];
++		struct ebt_match *match;
++	} u;
++	// size of data
++	unsigned int match_size;
++	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
++};
++
++struct ebt_entry_watcher
++{
++	union {
++		char name[EBT_FUNCTION_MAXNAMELEN];
++		struct ebt_watcher *watcher;
++	} u;
++	// size of data
++	unsigned int watcher_size;
++	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
++};
++
++struct ebt_entry_target
++{
++	union {
++		char name[EBT_FUNCTION_MAXNAMELEN];
++		struct ebt_target *target;
++	} u;
++	// size of data
++	unsigned int target_size;
++	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
++};
++
++#define EBT_STANDARD_TARGET "standard"
++struct ebt_standard_target
++{
++	struct ebt_entry_target target;
++	int verdict;
++};
++
++// one entry
++struct ebt_entry {
++	// this needs to be the first field
++	unsigned int bitmask;
++	unsigned int invflags;
++	uint16_t ethproto;
++	// the physical in-dev
++	char in[IFNAMSIZ];
++	// the logical in-dev
++	char logical_in[IFNAMSIZ];
++	// the physical out-dev
++	char out[IFNAMSIZ];
++	// the logical out-dev
++	char logical_out[IFNAMSIZ];
++	unsigned char sourcemac[ETH_ALEN];
++	unsigned char sourcemsk[ETH_ALEN];
++	unsigned char destmac[ETH_ALEN];
++	unsigned char destmsk[ETH_ALEN];
++	// sizeof ebt_entry + matches
++	unsigned int watchers_offset;
++	// sizeof ebt_entry + matches + watchers
++	unsigned int target_offset;
++	// sizeof ebt_entry + matches + watchers + target
++	unsigned int next_offset;
++	unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
++};
++
++// [gs]etsockopt numbers
++#define EBT_BASE_CTL            128
++
++#define EBT_SO_SET_ENTRIES      (EBT_BASE_CTL)
++#define EBT_SO_SET_COUNTERS     (EBT_SO_SET_ENTRIES+1)
++#define EBT_SO_SET_MAX          (EBT_SO_SET_COUNTERS+1)
++
++#define EBT_SO_GET_INFO         (EBT_BASE_CTL)
++#define EBT_SO_GET_ENTRIES      (EBT_SO_GET_INFO+1)
++#define EBT_SO_GET_INIT_INFO    (EBT_SO_GET_ENTRIES+1)
++#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
++#define EBT_SO_GET_MAX          (EBT_SO_GET_INIT_ENTRIES+1)
++
++#ifdef __KERNEL__
++
++// return values for match() functions
++#define EBT_MATCH 0
++#define EBT_NOMATCH 1
++
++struct ebt_match
++{
++	struct list_head list;
++	const char name[EBT_FUNCTION_MAXNAMELEN];
++	// 0 == it matches
++	int (*match)(const struct sk_buff *skb, const struct net_device *in,
++	   const struct net_device *out, const void *matchdata,
++	   unsigned int datalen);
++	// 0 == let it in
++	int (*check)(const char *tablename, unsigned int hookmask,
++	   const struct ebt_entry *e, void *matchdata, unsigned int datalen);
++	void (*destroy)(void *matchdata, unsigned int datalen);
++	struct module *me;
++};
++
++struct ebt_watcher
++{
++	struct list_head list;
++	const char name[EBT_FUNCTION_MAXNAMELEN];
++	void (*watcher)(const struct sk_buff *skb, const struct net_device *in,
++	   const struct net_device *out, const void *watcherdata,
++	   unsigned int datalen);
++	// 0 == let it in
++	int (*check)(const char *tablename, unsigned int hookmask,
++	   const struct ebt_entry *e, void *watcherdata, unsigned int datalen);
++	void (*destroy)(void *watcherdata, unsigned int datalen);
++	struct module *me;
++};
++
++struct ebt_target
++{
++	struct list_head list;
++	const char name[EBT_FUNCTION_MAXNAMELEN];
++	// returns one of the standard verdicts
++	int (*target)(struct sk_buff **pskb, unsigned int hooknr,
++	   const struct net_device *in, const struct net_device *out,
++	   const void *targetdata, unsigned int datalen);
++	// 0 == let it in
++	int (*check)(const char *tablename, unsigned int hookmask,
++	   const struct ebt_entry *e, void *targetdata, unsigned int datalen);
++	void (*destroy)(void *targetdata, unsigned int datalen);
++	struct module *me;
++};
++
++// used for jumping from and into user defined chains (udc)
++struct ebt_chainstack
++{
++	struct ebt_entries *chaininfo; // pointer to chain data
++	struct ebt_entry *e; // pointer to entry data
++	unsigned int n; // n'th entry
++};
++
++struct ebt_table_info
++{
++	// total size of the entries
++	unsigned int entries_size;
++	unsigned int nentries;
++	// pointers to the start of the chains
++	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
++	// room to maintain the stack used for jumping from and into udc
++	struct ebt_chainstack **chainstack;
++	char *entries;
++	struct ebt_counter counters[0] ____cacheline_aligned;
++};
++
++struct ebt_table
++{
++	struct list_head list;
++	char name[EBT_TABLE_MAXNAMELEN];
++	struct ebt_replace *table;
++	unsigned int valid_hooks;
++	rwlock_t lock;
++	// e.g. could be the table explicitly only allows certain
++	// matches, targets, ... 0 == let it in
++	int (*check)(const struct ebt_table_info *info,
++	   unsigned int valid_hooks);
++	// the data used by the kernel
++	struct ebt_table_info *private;
++};
++
++#define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_replace)-1)) & \
++		     ~(__alignof__(struct ebt_replace)-1))
++extern int ebt_register_table(struct ebt_table *table);
++extern void ebt_unregister_table(struct ebt_table *table);
++extern int ebt_register_match(struct ebt_match *match);
++extern void ebt_unregister_match(struct ebt_match *match);
++extern int ebt_register_watcher(struct ebt_watcher *watcher);
++extern void ebt_unregister_watcher(struct ebt_watcher *watcher);
++extern int ebt_register_target(struct ebt_target *target);
++extern void ebt_unregister_target(struct ebt_target *target);
++extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   struct ebt_table *table);
++
++   // Used in the kernel match() functions
++#define FWINV(bool,invflg) ((bool) ^ !!(info->invflags & invflg))
++// True if the hook mask denotes that the rule is in a base chain,
++// used in the check() functions
++#define BASE_CHAIN (hookmask & (1 << NF_BR_NUMHOOKS))
++// Clear the bit in the hook mask that tells if the rule is on a base chain
++#define CLEAR_BASE_CHAIN_BIT (hookmask &= ~(1 << NF_BR_NUMHOOKS))
++// True if the target is not a standard target
++#define INVALID_TARGET (info->target < -NUM_STANDARD_TARGETS || info->target >= 0)
++
++#endif /* __KERNEL__ */
++
++// blatently stolen from ip_tables.h
++// fn returns 0 to continue iteration
++#define EBT_MATCH_ITERATE(e, fn, args...)                   \
++({                                                          \
++	unsigned int __i;                                   \
++	int __ret = 0;                                      \
++	struct ebt_entry_match *__match;                    \
++	                                                    \
++	for (__i = sizeof(struct ebt_entry);                \
++	     __i < (e)->watchers_offset;                    \
++	     __i += __match->match_size +                   \
++	     sizeof(struct ebt_entry_match)) {              \
++		__match = (void *)(e) + __i;                \
++		                                            \
++		__ret = fn(__match , ## args);              \
++		if (__ret != 0)                             \
++			break;                              \
++	}                                                   \
++	if (__ret == 0) {                                   \
++		if (__i != (e)->watchers_offset)            \
++			__ret = -EINVAL;                    \
++	}                                                   \
++	__ret;                                              \
++})
++
++#define EBT_WATCHER_ITERATE(e, fn, args...)                 \
++({                                                          \
++	unsigned int __i;                                   \
++	int __ret = 0;                                      \
++	struct ebt_entry_watcher *__watcher;                \
++	                                                    \
++	for (__i = e->watchers_offset;                      \
++	     __i < (e)->target_offset;                      \
++	     __i += __watcher->watcher_size +               \
++	     sizeof(struct ebt_entry_watcher)) {            \
++		__watcher = (void *)(e) + __i;              \
++		                                            \
++		__ret = fn(__watcher , ## args);            \
++		if (__ret != 0)                             \
++			break;                              \
++	}                                                   \
++	if (__ret == 0) {                                   \
++		if (__i != (e)->target_offset)              \
++			__ret = -EINVAL;                    \
++	}                                                   \
++	__ret;                                              \
++})
++
++#define EBT_ENTRY_ITERATE(entries, size, fn, args...)       \
++({                                                          \
++	unsigned int __i;                                   \
++	int __ret = 0;                                      \
++	struct ebt_entry *__entry;                          \
++	                                                    \
++	for (__i = 0; __i < (size);) {                      \
++		__entry = (void *)(entries) + __i;          \
++		__ret = fn(__entry , ## args);              \
++		if (__ret != 0)                             \
++			break;                              \
++		if (__entry->bitmask != 0)                  \
++			__i += __entry->next_offset;        \
++		else                                        \
++			__i += sizeof(struct ebt_entries);  \
++	}                                                   \
++	if (__ret == 0) {                                   \
++		if (__i != (size))                          \
++			__ret = -EINVAL;                    \
++	}                                                   \
++	__ret;                                              \
++})
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_802_3.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,60 @@
++#ifndef __LINUX_BRIDGE_EBT_802_3_H
++#define __LINUX_BRIDGE_EBT_802_3_H
++
++#define EBT_802_3_SAP 0x01
++#define EBT_802_3_TYPE 0x02
++
++#define EBT_802_3_MATCH "802_3"
++
++/*
++ * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
++ * to discover what kind of packet we're carrying. 
++ */
++#define CHECK_TYPE 0xaa
++
++/*
++ * Control field may be one or two bytes.  If the first byte has
++ * the value 0x03 then the entire length is one byte, otherwise it is two.
++ * One byte controls are used in Unnumbered Information frames.
++ * Two byte controls are used in Numbered Information frames.
++ */
++#define IS_UI 0x03
++
++#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
++
++/* ui has one byte ctrl, ni has two */
++struct hdr_ui {
++	uint8_t dsap;
++	uint8_t ssap;
++	uint8_t ctrl;
++	uint8_t orig[3];
++	uint16_t type;
++};
++
++struct hdr_ni {
++	uint8_t dsap;
++	uint8_t ssap;
++	uint16_t ctrl;
++	uint8_t  orig[3];
++	uint16_t type;
++};
++
++struct ebt_802_3_hdr {
++	uint8_t  daddr[6];
++	uint8_t  saddr[6];
++	uint16_t len;
++	union {
++		struct hdr_ui ui;
++		struct hdr_ni ni;
++	} llc;
++};
++
++struct ebt_802_3_info 
++{
++	uint8_t  sap;
++	uint16_t type;
++	uint8_t  bitmask;
++	uint8_t  invflags;
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_arp.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,32 @@
++#ifndef __LINUX_BRIDGE_EBT_ARP_H
++#define __LINUX_BRIDGE_EBT_ARP_H
++
++#define EBT_ARP_OPCODE 0x01
++#define EBT_ARP_HTYPE 0x02
++#define EBT_ARP_PTYPE 0x04
++#define EBT_ARP_SRC_IP 0x08
++#define EBT_ARP_DST_IP 0x10
++#define EBT_ARP_SRC_MAC 0x20
++#define EBT_ARP_DST_MAC 0x40
++#define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \
++   EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)
++#define EBT_ARP_MATCH "arp"
++
++struct ebt_arp_info
++{
++	uint16_t htype;
++	uint16_t ptype;
++	uint16_t opcode;
++	uint32_t saddr;
++	uint32_t smsk;
++	uint32_t daddr;
++	uint32_t dmsk;
++	unsigned char smaddr[ETH_ALEN];
++	unsigned char smmsk[ETH_ALEN];
++	unsigned char dmaddr[ETH_ALEN];
++	unsigned char dmmsk[ETH_ALEN];
++	uint8_t  bitmask;
++	uint8_t  invflags;
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_ip.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,43 @@
++/*
++ *  ebt_ip
++ *
++ *	Authors:
++ *	Bart De Schuymer <bart.de.schuymer@pandora.be>
++ *
++ *  April, 2002
++ *
++ *  Changes:
++ *    added ip-sport and ip-dport
++ *    Innominate Security Technologies AG <mhopf@innominate.com>
++ *    September, 2002
++ */
++
++#ifndef __LINUX_BRIDGE_EBT_IP_H
++#define __LINUX_BRIDGE_EBT_IP_H
++
++#define EBT_IP_SOURCE 0x01
++#define EBT_IP_DEST 0x02
++#define EBT_IP_TOS 0x04
++#define EBT_IP_PROTO 0x08
++#define EBT_IP_SPORT 0x10
++#define EBT_IP_DPORT 0x20
++#define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
++ EBT_IP_SPORT | EBT_IP_DPORT )
++#define EBT_IP_MATCH "ip"
++
++// the same values are used for the invflags
++struct ebt_ip_info
++{
++	uint32_t saddr;
++	uint32_t daddr;
++	uint32_t smsk;
++	uint32_t dmsk;
++	uint8_t  tos;
++	uint8_t  protocol;
++	uint8_t  bitmask;
++	uint8_t  invflags;
++	uint16_t sport[2];
++	uint16_t dport[2];
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_pkttype.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,11 @@
++#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
++#define __LINUX_BRIDGE_EBT_PKTTYPE_H
++
++struct ebt_pkttype_info
++{
++	uint8_t pkt_type;
++	uint8_t invert;
++};
++#define EBT_PKTTYPE_MATCH "pkttype"
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_stp.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,46 @@
++#ifndef __LINUX_BRIDGE_EBT_STP_H
++#define __LINUX_BRIDGE_EBT_STP_H
++
++#define EBT_STP_TYPE		0x0001
++
++#define EBT_STP_FLAGS		0x0002
++#define EBT_STP_ROOTPRIO	0x0004
++#define EBT_STP_ROOTADDR	0x0008
++#define EBT_STP_ROOTCOST	0x0010
++#define EBT_STP_SENDERPRIO	0x0020
++#define EBT_STP_SENDERADDR	0x0040
++#define EBT_STP_PORT		0x0080
++#define EBT_STP_MSGAGE		0x0100
++#define EBT_STP_MAXAGE		0x0200
++#define EBT_STP_HELLOTIME	0x0400
++#define EBT_STP_FWDD		0x0800
++
++#define EBT_STP_MASK		0x0fff
++#define EBT_STP_CONFIG_MASK	0x0ffe
++
++#define EBT_STP_MATCH "stp"
++
++struct ebt_stp_config_info
++{
++	uint8_t flags;
++	uint16_t root_priol, root_priou;
++	char root_addr[6], root_addrmsk[6];
++	uint32_t root_costl, root_costu;
++	uint16_t sender_priol, sender_priou;
++	char sender_addr[6], sender_addrmsk[6];
++	uint16_t portl, portu;
++	uint16_t msg_agel, msg_ageu;
++	uint16_t max_agel, max_ageu;
++	uint16_t hello_timel, hello_timeu;
++	uint16_t forward_delayl, forward_delayu;
++};
++
++struct ebt_stp_info
++{
++	uint8_t type;
++	struct ebt_stp_config_info config;
++	uint16_t bitmask;
++	uint16_t invflags;
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_vlan.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,20 @@
++#ifndef __LINUX_BRIDGE_EBT_VLAN_H
++#define __LINUX_BRIDGE_EBT_VLAN_H
++
++#define EBT_VLAN_ID	0x01
++#define EBT_VLAN_PRIO	0x02
++#define EBT_VLAN_ENCAP	0x04
++#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO | EBT_VLAN_ENCAP)
++#define EBT_VLAN_MATCH "vlan"
++
++struct ebt_vlan_info {
++	uint16_t id;		/* VLAN ID {1-4095} */
++	uint8_t prio;		/* VLAN User Priority {0-7} */
++	uint16_t encap;		/* VLAN Encapsulated frame code {0-65535} */
++	uint8_t bitmask;		/* Args bitmask bit 1=1 - ID arg,
++				   bit 2=1 User-Priority arg, bit 3=1 encap*/
++	uint8_t invflags;		/* Inverse bitmask  bit 1=1 - inversed ID arg, 
++				   bit 2=1 - inversed Pirority arg */
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_log.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,17 @@
++#ifndef __LINUX_BRIDGE_EBT_LOG_H
++#define __LINUX_BRIDGE_EBT_LOG_H
++
++#define EBT_LOG_IP 0x01 // if the frame is made by ip, log the ip information
++#define EBT_LOG_ARP 0x02
++#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP)
++#define EBT_LOG_PREFIX_SIZE 30
++#define EBT_LOG_WATCHER "log"
++
++struct ebt_log_info
++{
++	uint8_t loglevel;
++	uint8_t prefix[EBT_LOG_PREFIX_SIZE];
++	uint32_t bitmask;
++};
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_nat.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,13 @@
++#ifndef __LINUX_BRIDGE_EBT_NAT_H
++#define __LINUX_BRIDGE_EBT_NAT_H
++
++struct ebt_nat_info
++{
++	unsigned char mac[ETH_ALEN];
++	// EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN
++	int target;
++};
++#define EBT_SNAT_TARGET "snat"
++#define EBT_DNAT_TARGET "dnat"
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_redirect.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,11 @@
++#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
++#define __LINUX_BRIDGE_EBT_REDIRECT_H
++
++struct ebt_redirect_info
++{
++	// EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN
++	int target;
++};
++#define EBT_REDIRECT_TARGET "redirect"
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_mark_m.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,15 @@
++#ifndef __LINUX_BRIDGE_EBT_MARK_M_H
++#define __LINUX_BRIDGE_EBT_MARK_M_H
++
++#define EBT_MARK_AND 0x01
++#define EBT_MARK_OR 0x02
++#define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR)
++struct ebt_mark_m_info
++{
++	unsigned long mark, mask;
++	uint8_t invert;
++	uint8_t bitmask;
++};
++#define EBT_MARK_MATCH "mark_m"
++
++#endif
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_bridge/ebt_mark_t.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,12 @@
++#ifndef __LINUX_BRIDGE_EBT_MARK_T_H
++#define __LINUX_BRIDGE_EBT_MARK_T_H
++
++struct ebt_mark_t_info
++{
++	unsigned long mark;
++	// EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN
++	int target;
++};
++#define EBT_MARK_TARGET "mark"
++
++#endif
+--- linux-2.4.21/include/linux/netfilter.h	Thu Nov 22 20:47:48 2001
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter.h	Fri Aug  8 01:09:06 2003
+@@ -117,28 +117,34 @@ extern struct list_head nf_hooks[NPROTO]
+ /* This is gross, but inline doesn't cut it for avoiding the function
+    call in fast path: gcc doesn't inline (needs value tracking?). --RR */
+ #ifdef CONFIG_NETFILTER_DEBUG
+-#define NF_HOOK nf_hook_slow
++#define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
++nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN)
++#define NF_HOOK_THRESH nf_hook_slow
+ #else
+ #define NF_HOOK(pf, hook, skb, indev, outdev, okfn)			\
+ (list_empty(&nf_hooks[(pf)][(hook)])					\
+  ? (okfn)(skb)								\
+- : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn)))
++ : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), INT_MIN))
++#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh)	\
++(list_empty(&nf_hooks[(pf)][(hook)])					\
++ ? (okfn)(skb)								\
++ : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn), (thresh)))
+ #endif
+ 
+ int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
+ 		 struct net_device *indev, struct net_device *outdev,
+-		 int (*okfn)(struct sk_buff *));
++		 int (*okfn)(struct sk_buff *), int thresh);
  
+ /* Call setsockopt() */
+-int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt, 
++int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt,
+ 		  int len);
+ int nf_getsockopt(struct sock *sk, int pf, int optval, char *opt,
+ 		  int *len);
  
- #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
--void (*br_handle_frame_hook)(struct sk_buff *skb) = NULL;
-+int (*br_handle_frame_hook)(struct sk_buff *skb) = NULL;
+ /* Packet queuing */
+-typedef int (*nf_queue_outfn_t)(struct sk_buff *skb, 
++typedef int (*nf_queue_outfn_t)(struct sk_buff *skb,
+                                 struct nf_info *info, void *data);
+-extern int nf_register_queue_handler(int pf, 
++extern int nf_register_queue_handler(int pf,
+                                      nf_queue_outfn_t outfn, void *data);
+ extern int nf_unregister_queue_handler(int pf);
+ extern void nf_reinject(struct sk_buff *skb,
+--- linux-2.4.21/include/linux/netfilter_ipv4.h	Mon Feb 25 20:38:13 2002
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_ipv4.h	Fri Aug  8 01:09:06 2003
+@@ -52,8 +52,10 @@
+ enum nf_ip_hook_priorities {
+ 	NF_IP_PRI_FIRST = INT_MIN,
+ 	NF_IP_PRI_CONNTRACK = -200,
++	NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD = -175,
+ 	NF_IP_PRI_MANGLE = -150,
+ 	NF_IP_PRI_NAT_DST = -100,
++	NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50,
+ 	NF_IP_PRI_FILTER = 0,
+ 	NF_IP_PRI_NAT_SRC = 100,
+ 	NF_IP_PRI_LAST = INT_MAX,
+--- linux-2.4.21/include/linux/skbuff.h	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/include/linux/skbuff.h	Fri Aug  8 01:09:06 2003
+@@ -92,6 +92,17 @@ struct nf_conntrack {
+ struct nf_ct_info {
+ 	struct nf_conntrack *master;
+ };
++
++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
++struct nf_bridge_info {
++	atomic_t use;
++	struct net_device *physindev;
++	struct net_device *physoutdev;
++	unsigned int mask;
++	unsigned long hh[16 / sizeof(unsigned long)];
++};
++#endif
++
  #endif
  
- static __inline__ int handle_bridge(struct sk_buff *skb,
-@@ -1410,7 +1410,6 @@
- 		}
- 	}
+ struct sk_buff_head {
+@@ -204,6 +215,9 @@ struct sk_buff {
+ #ifdef CONFIG_NETFILTER_DEBUG
+         unsigned int nf_debug;
+ #endif
++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
++	struct nf_bridge_info	*nf_bridge;	/* Saved data about a bridged frame - see br_netfilter.c */
++#endif
+ #endif /*CONFIG_NETFILTER*/
  
--	br_handle_frame_hook(skb);
- 	return ret;
+ #if defined(CONFIG_HIPPI)
+@@ -278,7 +292,7 @@ static inline struct sk_buff *skb_get(st
+  * If users==1, we are the only owner and are can avoid redundant
+  * atomic change.
+  */
+- 
++
+ /**
+  *	kfree_skb - free an sk_buff
+  *	@skb: buffer to free
+@@ -286,7 +300,7 @@ static inline struct sk_buff *skb_get(st
+  *	Drop a reference to the buffer and free it if the usage count has
+  *	hit zero.
+  */
+- 
++
+ static inline void kfree_skb(struct sk_buff *skb)
+ {
+ 	if (atomic_read(&skb->users) == 1 || atomic_dec_and_test(&skb->users))
+@@ -1165,6 +1179,20 @@ nf_conntrack_get(struct nf_ct_info *nfct
+ 	if (nfct)
+ 		atomic_inc(&nfct->master->use);
  }
- 
-@@ -1470,7 +1469,12 @@
- #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
- 	if (skb->dev->br_port != NULL &&
- 	    br_handle_frame_hook != NULL) {
--		return handle_bridge(skb, pt_prev);
-+		int ret;
 +
-+		ret = handle_bridge(skb, pt_prev);
-+		if (br_handle_frame_hook(skb) == 0)
-+			return ret;
-+		pt_prev = NULL;
- 	}
++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
++static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge)
++{
++	if (nf_bridge && atomic_dec_and_test(&nf_bridge->use))
++		kfree(nf_bridge);
++}
++static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge)
++{
++	if (nf_bridge)
++		atomic_inc(&nf_bridge->use);
++}
++#endif
++
  #endif
  
-diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
---- linux.stock/net/core/netfilter.c	2004-07-10 23:29:56.000000000 -0400
-+++ linux/net/core/netfilter.c	2004-07-10 23:46:39.000000000 -0400
-@@ -344,10 +344,15 @@
+ #endif	/* __KERNEL__ */
+--- linux-2.4.21/net/core/netfilter.c	Sat Aug  3 02:39:46 2002
++++ linux-2.4.21-ebt-brnf-3/net/core/netfilter.c	Fri Aug  8 01:09:06 2003
+@@ -1,4 +1,4 @@
+-/* netfilter.c: look after the filters for various protocols. 
++/* netfilter.c: look after the filters for various protocols.
+  * Heavily influenced by the old firewall.c by David Bonn and Alan Cox.
+  *
+  * Thanks to Rob `CmdrTaco' Malda for not influencing this code in any
+@@ -342,10 +342,15 @@ static unsigned int nf_iterate(struct li
  			       const struct net_device *indev,
  			       const struct net_device *outdev,
  			       struct list_head **i,
@@ -5900,7 +4396,42 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  		switch (elem->hook(hook, skb, indev, outdev, okfn)) {
  		case NF_QUEUE:
  			return NF_QUEUE;
-@@ -415,6 +420,10 @@
+@@ -365,7 +370,7 @@ static unsigned int nf_iterate(struct li
+ 			break;
+ 
+ 		default:
+-			NFDEBUG("Evil return from %p(%u).\n", 
++			NFDEBUG("Evil return from %p(%u).\n",
+ 				elem->hook, hook);
+ #endif
+ 		}
+@@ -374,7 +379,7 @@ static unsigned int nf_iterate(struct li
+ }
+ 
+ int nf_register_queue_handler(int pf, nf_queue_outfn_t outfn, void *data)
+-{      
++{
+ 	int ret;
+ 
+ 	br_write_lock_bh(BR_NETPROTO_LOCK);
+@@ -400,12 +405,12 @@ int nf_unregister_queue_handler(int pf)
+ 	return 0;
+ }
+ 
+-/* 
+- * Any packet that leaves via this function must come back 
++/*
++ * Any packet that leaves via this function must come back
+  * through nf_reinject().
+  */
+-static void nf_queue(struct sk_buff *skb, 
+-		     struct list_head *elem, 
++static void nf_queue(struct sk_buff *skb,
++		     struct list_head *elem,
+ 		     int pf, unsigned int hook,
+ 		     struct net_device *indev,
+ 		     struct net_device *outdev,
+@@ -413,6 +418,10 @@ static void nf_queue(struct sk_buff *skb
  {
  	int status;
  	struct nf_info *info;
@@ -5911,7 +4442,15 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  
  	if (!queue_handler[pf].outfn) {
  		kfree_skb(skb);
-@@ -437,11 +446,24 @@
+@@ -428,18 +437,31 @@ static void nf_queue(struct sk_buff *skb
+ 		return;
+ 	}
+ 
+-	*info = (struct nf_info) { 
++	*info = (struct nf_info) {
+ 		(struct nf_hook_ops *)elem, pf, hook, indev, outdev, okfn };
+ 
+ 	/* Bump dev refs so they don't vanish while packet is out */
  	if (indev) dev_hold(indev);
  	if (outdev) dev_hold(outdev);
  
@@ -5936,7 +4475,7 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  		kfree(info);
  		kfree_skb(skb);
  		return;
-@@ -451,7 +473,8 @@
+@@ -449,7 +471,8 @@ static void nf_queue(struct sk_buff *skb
  int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
  		 struct net_device *indev,
  		 struct net_device *outdev,
@@ -5946,7 +4485,7 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  {
  	struct list_head *elem;
  	unsigned int verdict;
-@@ -483,7 +506,7 @@
+@@ -481,7 +504,7 @@ int nf_hook_slow(int pf, unsigned int ho
  
  	elem = &nf_hooks[pf][hook];
  	verdict = nf_iterate(&nf_hooks[pf][hook], &skb, hook, indev,
@@ -5955,7 +4494,7 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  	if (verdict == NF_QUEUE) {
  		NFDEBUG("nf_hook: Verdict = QUEUE.\n");
  		nf_queue(skb, elem, pf, hook, indev, outdev, okfn);
-@@ -512,6 +535,14 @@
+@@ -510,6 +533,14 @@ void nf_reinject(struct sk_buff *skb, st
  
  	/* We don't have BR_NETPROTO_LOCK here */
  	br_read_lock_bh(BR_NETPROTO_LOCK);
@@ -5970,19 +4509,47 @@ diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
  	for (i = nf_hooks[info->pf][info->hook].next; i != elem; i = i->next) {
  		if (i == &nf_hooks[info->pf][info->hook]) {
  			/* The module which sent it to userspace is gone. */
-@@ -532,7 +563,7 @@
+@@ -528,9 +559,9 @@ void nf_reinject(struct sk_buff *skb, st
+ 
+ 	if (verdict == NF_ACCEPT) {
  		verdict = nf_iterate(&nf_hooks[info->pf][info->hook],
- 				     &skb, info->hook, 
+-				     &skb, info->hook, 
++				     &skb, info->hook,
  				     info->indev, info->outdev, &elem,
 -				     info->okfn);
 +				     info->okfn, INT_MIN);
  	}
  
  	switch (verdict) {
-diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
---- linux.stock/net/core/skbuff.c	2003-10-14 04:09:32.000000000 -0400
-+++ linux/net/core/skbuff.c	2004-07-10 23:46:39.000000000 -0400
-@@ -244,6 +244,9 @@
+@@ -539,20 +570,19 @@ void nf_reinject(struct sk_buff *skb, st
+ 		break;
+ 
+ 	case NF_QUEUE:
+-		nf_queue(skb, elem, info->pf, info->hook, 
++		nf_queue(skb, elem, info->pf, info->hook,
+ 			 info->indev, info->outdev, info->okfn);
+ 		break;
+-
+-	case NF_DROP:
+-		kfree_skb(skb);
+-		break;
+ 	}
+ 	br_read_unlock_bh(BR_NETPROTO_LOCK);
+ 
+ 	/* Release those devices we held, or Alexey will kill me. */
+ 	if (info->indev) dev_put(info->indev);
+ 	if (info->outdev) dev_put(info->outdev);
+-	
++
++	if (verdict == NF_DROP)
++		kfree_skb(skb);
++
+ 	kfree(info);
+ 	return;
+ }
+--- linux-2.4.21/net/core/skbuff.c	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/net/core/skbuff.c	Fri Aug  8 01:09:06 2003
+@@ -245,6 +245,9 @@ static inline void skb_headerinit(void *
  #ifdef CONFIG_NETFILTER_DEBUG
  	skb->nf_debug = 0;
  #endif
@@ -5992,7 +4559,7 @@ diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
  #endif
  #ifdef CONFIG_NET_SCHED
  	skb->tc_index = 0;
-@@ -324,6 +327,9 @@
+@@ -325,6 +328,9 @@ void __kfree_skb(struct sk_buff *skb)
  	}
  #ifdef CONFIG_NETFILTER
  	nf_conntrack_put(skb->nfct);
@@ -6002,7 +4569,7 @@ diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
  #endif
  	skb_headerinit(skb, NULL, 0);  /* clean state */
  	kfree_skbmem(skb);
-@@ -390,6 +396,9 @@
+@@ -391,6 +397,9 @@ struct sk_buff *skb_clone(struct sk_buff
  #ifdef CONFIG_NETFILTER_DEBUG
  	C(nf_debug);
  #endif
@@ -6012,7 +4579,7 @@ diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
  #endif /*CONFIG_NETFILTER*/
  #if defined(CONFIG_HIPPI)
  	C(private);
-@@ -402,6 +411,9 @@
+@@ -403,6 +412,9 @@ struct sk_buff *skb_clone(struct sk_buff
  	skb->cloned = 1;
  #ifdef CONFIG_NETFILTER
  	nf_conntrack_get(skb->nfct);
@@ -6022,71 +4589,20 @@ diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
  #endif
  	return n;
  }
-@@ -436,6 +448,10 @@
+@@ -436,6 +448,10 @@ static void copy_skb_header(struct sk_bu
+ 	nf_conntrack_get(new->nfct);
  #ifdef CONFIG_NETFILTER_DEBUG
  	new->nf_debug=old->nf_debug;
- #endif
++#endif
 +#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
 +	new->nf_bridge=old->nf_bridge;
 +	nf_bridge_get(new->nf_bridge);
-+#endif
  #endif
- #ifdef CONFIG_NET_SCHED
- 	new->tc_index = old->tc_index;
-@@ -722,8 +738,8 @@
- 	/* Set the tail pointer and length */
- 	skb_put(n,skb->len);
- 
--	/* Copy the data only. */
--	if (skb_copy_bits(skb, 0, n->data, skb->len))
-+       /* Copy the linear data and header. */
-+       if (skb_copy_bits(skb, -newheadroom, n->head, newheadroom + skb->len))
- 		BUG();
- 
- 	copy_skb_header(n, skb);
-diff -Nurb linux.stock/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
---- linux.stock/net/ipv4/ip_output.c	2003-10-14 04:09:33.000000000 -0400
-+++ linux/net/ipv4/ip_output.c	2004-07-10 23:46:39.000000000 -0400
-@@ -879,6 +879,10 @@
- 		/* Connection association is same as pre-frag packet */
- 		skb2->nfct = skb->nfct;
- 		nf_conntrack_get(skb2->nfct);
-+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
-+		skb2->nf_bridge = skb->nf_bridge;
-+		nf_bridge_get(skb2->nf_bridge);
-+#endif
- #ifdef CONFIG_NETFILTER_DEBUG
- 		skb2->nf_debug = skb->nf_debug;
  #endif
-diff -Nurb linux.stock/net/ipv4/netfilter/Config.in linux/net/ipv4/netfilter/Config.in
---- linux.stock/net/ipv4/netfilter/Config.in	2004-07-10 23:30:19.000000000 -0400
-+++ linux/net/ipv4/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
-@@ -83,6 +83,9 @@
-     dep_tristate '  String match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_STRING $CONFIG_IP_NF_IPTABLES
-     dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
-   fi
-+  if [ "$CONFIG_BRIDGE" != "n" ]; then
-+    dep_tristate '  Physdev match support' CONFIG_IP_NF_MATCH_PHYSDEV $CONFIG_IP_NF_IPTABLES
-+  fi
- # The targets
-   dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
-   if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then
-diff -Nurb linux.stock/net/ipv4/netfilter/Makefile linux/net/ipv4/netfilter/Makefile
---- linux.stock/net/ipv4/netfilter/Makefile	2004-07-10 23:30:19.000000000 -0400
-+++ linux/net/ipv4/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
-@@ -149,6 +149,8 @@
- obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
- obj-$(CONFIG_IP_NF_MATCH_REALM) += ipt_realm.o
- 
-+obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt_physdev.o
-+
- # targets
- obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
- obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o
-diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/ip_tables.c
---- linux.stock/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:29:53.000000000 -0400
-+++ linux/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:46:39.000000000 -0400
-@@ -121,12 +121,19 @@
+ #ifdef CONFIG_NET_SCHED
+--- linux-2.4.21/net/ipv4/netfilter/ip_tables.c	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/ip_tables.c	Fri Aug  8 01:09:06 2003
+@@ -121,12 +121,19 @@ static LIST_HEAD(ipt_tables);
  static inline int
  ip_packet_match(const struct iphdr *ip,
  		const char *indev,
@@ -6106,7 +4622,7 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  
  #define FWINV(bool,invflg) ((bool) ^ !!(ipinfo->invflags & invflg))
  
-@@ -156,7 +163,15 @@
+@@ -156,7 +163,15 @@ ip_packet_match(const struct iphdr *ip,
  			& ((const unsigned long *)ipinfo->iniface_mask)[i];
  	}
  
@@ -6123,7 +4639,7 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  		dprintf("VIA in mismatch (%s vs %s).%s\n",
  			indev, ipinfo->iniface,
  			ipinfo->invflags&IPT_INV_VIA_IN ?" (INV)":"");
-@@ -169,7 +184,15 @@
+@@ -169,7 +184,15 @@ ip_packet_match(const struct iphdr *ip,
  			& ((const unsigned long *)ipinfo->outiface_mask)[i];
  	}
  
@@ -6140,7 +4656,7 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  		dprintf("VIA out mismatch (%s vs %s).%s\n",
  			outdev, ipinfo->outiface,
  			ipinfo->invflags&IPT_INV_VIA_OUT ?" (INV)":"");
-@@ -272,6 +295,9 @@
+@@ -268,6 +291,9 @@ ipt_do_table(struct sk_buff **pskb,
  	/* Initializing verdict to NF_DROP keeps gcc happy. */
  	unsigned int verdict = NF_DROP;
  	const char *indev, *outdev;
@@ -6150,7 +4666,7 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  	void *table_base;
  	struct ipt_entry *e, *back;
  
-@@ -281,6 +307,13 @@
+@@ -277,6 +303,13 @@ ipt_do_table(struct sk_buff **pskb,
  	datalen = (*pskb)->len - ip->ihl * 4;
  	indev = in ? in->name : nulldevname;
  	outdev = out ? out->name : nulldevname;
@@ -6164,7 +4680,7 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  	/* We handle fragments by dealing with the first fragment as
  	 * if it was a normal packet.  All other fragments are treated
  	 * normally, except that they will NEVER match rules that ask
-@@ -316,7 +349,15 @@
+@@ -312,7 +345,15 @@ ipt_do_table(struct sk_buff **pskb,
  		IP_NF_ASSERT(e);
  		IP_NF_ASSERT(back);
  		(*pskb)->nfcache |= e->nfcache;
@@ -6181,11 +4697,23 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/i
  			struct ipt_entry_target *t;
  
  			if (IPT_MATCH_ITERATE(e, do_match,
-diff -Nurb linux.stock/net/ipv4/netfilter/ipt_LOG.c linux/net/ipv4/netfilter/ipt_LOG.c
---- linux.stock/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:29:56.000000000 -0400
-+++ linux/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:46:39.000000000 -0400
-@@ -319,6 +319,18 @@
- 	       prefix == NULL ? loginfo->prefix : prefix,
+--- linux-2.4.21/net/ipv4/ip_output.c	Fri Nov 29 00:53:15 2002
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/ip_output.c	Fri Aug  8 01:09:06 2003
+@@ -879,6 +879,10 @@ int ip_fragment(struct sk_buff *skb, int
+ 		/* Connection association is same as pre-frag packet */
+ 		skb2->nfct = skb->nfct;
+ 		nf_conntrack_get(skb2->nfct);
++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
++		skb2->nf_bridge = skb->nf_bridge;
++		nf_bridge_get(skb2->nf_bridge);
++#endif
+ #ifdef CONFIG_NETFILTER_DEBUG
+ 		skb2->nf_debug = skb->nf_debug;
+ #endif
+--- linux-2.4.21/net/ipv4/netfilter/ipt_LOG.c	Mon Feb 25 20:38:14 2002
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/ipt_LOG.c	Fri Aug  8 01:09:06 2003
+@@ -289,6 +289,18 @@ ipt_log_target(struct sk_buff **pskb,
+ 	       loginfo->prefix,
  	       in ? in->name : "",
  	       out ? out->name : "");
 +#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
@@ -6203,9 +4731,678 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ipt_LOG.c linux/net/ipv4/netfilter/ipt
  	if (in && !out) {
  		/* MAC logging for input chain only. */
  		printk("MAC=");
-diff -Nurb linux.stock/net/ipv4/netfilter/ipt_physdev.c linux/net/ipv4/netfilter/ipt_physdev.c
---- linux.stock/net/ipv4/netfilter/ipt_physdev.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux/net/ipv4/netfilter/ipt_physdev.c	2004-07-10 23:46:39.000000000 -0400
+--- linux-2.4.21/net/ipv4/netfilter/Makefile	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/Makefile	Fri Aug  8 01:09:06 2003
+@@ -84,6 +84,8 @@ obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += i
+ obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
+ obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
+ 
++obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt_physdev.o
++
+ # targets
+ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
+ obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o
+@@ -100,6 +102,7 @@ obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt
+ 
+ # generic ARP tables
+ obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
++obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o
+ 
+ # just filtering instance of ARP tables for now
+ obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o
+--- linux-2.4.21/net/ipv4/netfilter/Config.in	Fri Jun 13 16:51:39 2003
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/Config.in	Fri Aug  8 01:09:06 2003
+@@ -43,6 +43,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
+     dep_tristate '  Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
+     dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
+   fi
++  if [ "$CONFIG_BRIDGE" != "n" ]; then
++    dep_tristate '  Physdev match support' CONFIG_IP_NF_MATCH_PHYSDEV
++  fi
+ # The targets
+   dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
+   if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/bridge/br_netfilter.c	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,636 @@
++/*
++ *	Handle firewalling
++ *	Linux ethernet bridge
++ *
++ *	Authors:
++ *	Lennert Buytenhek               <buytenh@gnu.org>
++ *	Bart De Schuymer		<bdschuym@pandora.be>
++ *
++ *	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.
++ *
++ *	Lennert dedicates this file to Kerstin Wurdinger.
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/ip.h>
++#include <linux/netdevice.h>
++#include <linux/skbuff.h>
++#include <linux/if_ether.h>
++#include <linux/netfilter_bridge.h>
++#include <linux/netfilter_ipv4.h>
++#include <linux/in_route.h>
++#include <net/ip.h>
++#include <asm/uaccess.h>
++#include <asm/checksum.h>
++#include "br_private.h"
++
++
++#define skb_origaddr(skb)	 (((struct bridge_skb_cb *) \
++				 (skb->cb))->daddr.ipv4)
++#define store_orig_dstaddr(skb)	 (skb_origaddr(skb) = (skb)->nh.iph->daddr)
++#define dnat_took_place(skb)	 (skb_origaddr(skb) != (skb)->nh.iph->daddr)
++#define clear_cb(skb)		 (memset(&skb_origaddr(skb), 0, \
++				 sizeof(struct bridge_skb_cb)))
++
++#define has_bridge_parent(device)	((device)->br_port != NULL)
++#define bridge_parent(device)		(&((device)->br_port->br->dev))
++
++/* We need these fake structures to make netfilter happy --
++ * lots of places assume that skb->dst != NULL, which isn't
++ * all that unreasonable.
++ *
++ * Currently, we fill in the PMTU entry because netfilter
++ * refragmentation needs it, and the rt_flags entry because
++ * ipt_REJECT needs it.  Future netfilter modules might
++ * require us to fill additional fields.
++ */
++static struct net_device __fake_net_device = {
++	.hard_header_len	= ETH_HLEN
++};
++
++static struct rtable __fake_rtable = {
++	u: {
++		dst: {
++			__refcnt:		ATOMIC_INIT(1),
++			dev:			&__fake_net_device,
++			pmtu:			1500
++		}
++	},
++
++	rt_flags:	0
++};
++
++
++/* PF_BRIDGE/PRE_ROUTING *********************************************/
++static void __br_dnat_complain(void)
++{
++	static unsigned long last_complaint = 0;
++
++	if (jiffies - last_complaint >= 5 * HZ) {
++		printk(KERN_WARNING "Performing cross-bridge DNAT requires IP "
++			"forwarding to be enabled\n");
++		last_complaint = jiffies;
++	}
++}
++
++
++/* This requires some explaining. If DNAT has taken place,
++ * we will need to fix up the destination Ethernet address,
++ * and this is a tricky process.
++ *
++ * There are two cases to consider:
++ * 1. The packet was DNAT'ed to a device in the same bridge
++ *    port group as it was received on. We can still bridge
++ *    the packet.
++ * 2. The packet was DNAT'ed to a different device, either
++ *    a non-bridged device or another bridge port group.
++ *    The packet will need to be routed.
++ *
++ * The correct way of distinguishing between these two cases is to
++ * call ip_route_input() and to look at skb->dst->dev, which is
++ * changed to the destination device if ip_route_input() succeeds.
++ *
++ * Let us first consider the case that ip_route_input() succeeds:
++ *
++ * If skb->dst->dev equals the logical bridge device the packet
++ * came in on, we can consider this bridging. We then call
++ * skb->dst->output() which will make the packet enter br_nf_local_out()
++ * not much later. In that function it is assured that the iptables
++ * FORWARD chain is traversed for the packet.
++ *
++ * Otherwise, the packet is considered to be routed and we just
++ * change the destination MAC address so that the packet will
++ * later be passed up to the IP stack to be routed.
++ *
++ * Let us now consider the case that ip_route_input() fails:
++ *
++ * After a "echo '0' > /proc/sys/net/ipv4/ip_forward" ip_route_input()
++ * will fail, while __ip_route_output_key() will return success. The source
++ * address for __ip_route_output_key() is set to zero, so __ip_route_output_key
++ * thinks we're handling a locally generated packet and won't care
++ * if IP forwarding is allowed. We send a warning message to the users's
++ * log telling her to put IP forwarding on.
++ *
++ * ip_route_input() will also fail if there is no route available.
++ * In that case we just drop the packet.
++ *
++ * --Lennert, 20020411
++ * --Bart, 20020416 (updated)
++ * --Bart, 20021007 (updated)
++ */
++
++static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
++{
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug |= (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_FORWARD);
++#endif
++
++	if (skb->pkt_type == PACKET_OTHERHOST) {
++		skb->pkt_type = PACKET_HOST;
++		skb->nf_bridge->mask |= BRNF_PKT_TYPE;
++	}
++
++	skb->dev = bridge_parent(skb->dev);
++	skb->dst->output(skb);
++	return 0;
++}
++
++static int br_nf_pre_routing_finish(struct sk_buff *skb)
++{
++	struct net_device *dev = skb->dev;
++	struct iphdr *iph = skb->nh.iph;
++	struct nf_bridge_info *nf_bridge = skb->nf_bridge;
++
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING);
++#endif
++
++	if (nf_bridge->mask & BRNF_PKT_TYPE) {
++		skb->pkt_type = PACKET_OTHERHOST;
++		nf_bridge->mask ^= BRNF_PKT_TYPE;
++	}
++
++	if (dnat_took_place(skb)) {
++		if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
++		    dev)) {
++			struct rtable *rt;
++
++			if (!ip_route_output(&rt, iph->daddr, 0, iph->tos, 0)) {
++				/* Bridged-and-DNAT'ed traffic doesn't
++				 * require ip_forwarding.
++				 */
++				if (((struct dst_entry *)rt)->dev == dev) {
++					skb->dst = (struct dst_entry *)rt;
++					goto bridged_dnat;
++				}
++				__br_dnat_complain();
++				dst_release((struct dst_entry *)rt);
++			}
++			kfree_skb(skb);
++			return 0;
++		} else {
++			if (skb->dst->dev == dev) {
++bridged_dnat:
++				/* Tell br_nf_local_out this is a
++				 * bridged frame
++				 */
++				nf_bridge->mask |= BRNF_BRIDGED_DNAT;
++				skb->dev = nf_bridge->physindev;
++				clear_cb(skb);
++				NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING,
++					       skb, skb->dev, NULL,
++					       br_nf_pre_routing_finish_bridge,
++					       1);
++				return 0;
++			}
++			memcpy(skb->mac.ethernet->h_dest, dev->dev_addr,
++			       ETH_ALEN);
++		}
++	} else {
++		skb->dst = (struct dst_entry *)&__fake_rtable;
++		dst_hold(skb->dst);
++	}
++
++	clear_cb(skb);
++	skb->dev = nf_bridge->physindev;
++	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		       br_handle_frame_finish, 1);
++
++	return 0;
++}
++
++/* Replicate the checks that IPv4 does on packet reception.
++ * Set skb->dev to the bridge device (i.e. parent of the
++ * receiving device) to make netfilter happy, the REDIRECT
++ * target in particular.  Save the original destination IP
++ * address to be able to detect DNAT afterwards.
++ */
++static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	struct iphdr *iph;
++	__u32 len;
++	struct sk_buff *skb;
++	struct nf_bridge_info *nf_bridge;
++
++	if ((*pskb)->protocol != __constant_htons(ETH_P_IP))
++		return NF_ACCEPT;
++
++	if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
++		goto out;
++
++	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
++		goto inhdr_error;
++
++	iph = skb->nh.iph;
++	if (iph->ihl < 5 || iph->version != 4)
++		goto inhdr_error;
++
++	if (!pskb_may_pull(skb, 4*iph->ihl))
++		goto inhdr_error;
++
++	iph = skb->nh.iph;
++	if (ip_fast_csum((__u8 *)iph, iph->ihl) != 0)
++		goto inhdr_error;
++
++	len = ntohs(iph->tot_len);
++	if (skb->len < len || len < 4*iph->ihl)
++		goto inhdr_error;
++
++	if (skb->len > len) {
++		__pskb_trim(skb, len);
++		if (skb->ip_summed == CHECKSUM_HW)
++			skb->ip_summed = CHECKSUM_NONE;
++	}
++
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug ^= (1 << NF_IP_PRE_ROUTING);
++#endif
++ 	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
++		return NF_DROP;
++
++	if (skb->pkt_type == PACKET_OTHERHOST) {
++		skb->pkt_type = PACKET_HOST;
++		nf_bridge->mask |= BRNF_PKT_TYPE;
++	}
++
++	nf_bridge->physindev = skb->dev;
++	skb->dev = bridge_parent(skb->dev);
++	store_orig_dstaddr(skb);
++
++	NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL,
++		br_nf_pre_routing_finish);
++
++	return NF_STOLEN;
++
++inhdr_error:
++//	IP_INC_STATS_BH(IpInHdrErrors);
++out:
++	return NF_DROP;
++}
++
++
++/* PF_BRIDGE/LOCAL_IN ************************************************/
++/* The packet is locally destined, which requires a real
++ * dst_entry, so detach the fake one.  On the way up, the
++ * packet would pass through PRE_ROUTING again (which already
++ * took place when the packet entered the bridge), but we
++ * register an IPv4 PRE_ROUTING 'sabotage' hook that will
++ * prevent this from happening.
++ */
++static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	struct sk_buff *skb = *pskb;
++
++	if (skb->protocol != __constant_htons(ETH_P_IP))
++		return NF_ACCEPT;
++
++	if (skb->dst == (struct dst_entry *)&__fake_rtable) {
++		dst_release(skb->dst);
++		skb->dst = NULL;
++	}
++
++	return NF_ACCEPT;
++}
++
++
++/* PF_BRIDGE/FORWARD *************************************************/
++static int br_nf_forward_finish(struct sk_buff *skb)
++{
++	struct nf_bridge_info *nf_bridge = skb->nf_bridge;
++
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug ^= (1 << NF_BR_FORWARD);
++#endif
++
++	if (nf_bridge->mask & BRNF_PKT_TYPE) {
++		skb->pkt_type = PACKET_OTHERHOST;
++		nf_bridge->mask ^= BRNF_PKT_TYPE;
++	}
++
++	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, nf_bridge->physindev,
++			skb->dev, br_forward_finish, 1);
++
++	return 0;
++}
++
++/* This is the 'purely bridged' case.  We pass the packet to
++ * netfilter with indev and outdev set to the bridge device,
++ * but we are still able to filter on the 'real' indev/outdev
++ * because of the ipt_physdev.c module.
++ */
++static unsigned int br_nf_forward(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	struct sk_buff *skb = *pskb;
++	struct nf_bridge_info *nf_bridge;
++
++	if (skb->protocol != __constant_htons(ETH_P_IP))
++		return NF_ACCEPT;
++
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug ^= (1 << NF_BR_FORWARD);
++#endif
++
++	nf_bridge = skb->nf_bridge;
++	if (skb->pkt_type == PACKET_OTHERHOST) {
++		skb->pkt_type = PACKET_HOST;
++		nf_bridge->mask |= BRNF_PKT_TYPE;
++	}
++
++	nf_bridge->mask |= BRNF_BRIDGED; /* The physdev module checks on this */
++	nf_bridge->physoutdev = skb->dev;
++
++	NF_HOOK(PF_INET, NF_IP_FORWARD, skb, bridge_parent(nf_bridge->physindev),
++			bridge_parent(skb->dev), br_nf_forward_finish);
++
++	return NF_STOLEN;
++}
++
++
++/* PF_BRIDGE/LOCAL_OUT ***********************************************/
++static int br_nf_local_out_finish(struct sk_buff *skb)
++{
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug &= ~(1 << NF_BR_LOCAL_OUT);
++#endif
++
++	NF_HOOK_THRESH(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++			br_forward_finish, NF_BR_PRI_FIRST + 1);
++
++	return 0;
++}
++
++
++/* This function sees both locally originated IP packets and forwarded
++ * IP packets (in both cases the destination device is a bridge
++ * device). It also sees bridged-and-DNAT'ed packets.
++ * To be able to filter on the physical bridge devices (with the ipt_physdev.c
++ * module), we steal packets destined to a bridge device away from the
++ * PF_INET/FORWARD and PF_INET/OUTPUT hook functions, and give them back later,
++ * when we have determined the real output device. This is done in here.
++ *
++ * If (nf_bridge->mask & BRNF_BRIDGED_DNAT) then the packet is bridged
++ * and we fake the PF_BRIDGE/FORWARD hook. The function br_nf_forward()
++ * will then fake the PF_INET/FORWARD hook. br_nf_local_out() has priority
++ * NF_BR_PRI_FIRST, so no relevant PF_BRIDGE/INPUT functions have been nor
++ * will be executed.
++ * Otherwise, if nf_bridge->physindev is NULL, the bridge-nf code never touched
++ * this packet before, and so the packet was locally originated. We fake
++ * the PF_INET/LOCAL_OUT hook.
++ * Finally, if nf_bridge->physindev isn't NULL, then the packet was IP routed,
++ * so we fake the PF_INET/FORWARD hook. ipv4_sabotage_out() makes sure
++ * even routed packets that didn't arrive on a bridge interface have their
++ * nf_bridge->physindev set.
++ */
++
++static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*_okfn)(struct sk_buff *))
++{
++	int (*okfn)(struct sk_buff *skb);
++	struct net_device *realindev;
++	struct sk_buff *skb = *pskb;
++	struct nf_bridge_info *nf_bridge;
++
++	if (skb->protocol != __constant_htons(ETH_P_IP))
++		return NF_ACCEPT;
++
++	/* Sometimes we get packets with NULL ->dst here (for example,
++	 * running a dhcp client daemon triggers this).
++	 */
++	if (skb->dst == NULL)
++		return NF_ACCEPT;
++
++	nf_bridge = skb->nf_bridge;
++	nf_bridge->physoutdev = skb->dev;
++
++	realindev = nf_bridge->physindev;
++
++	/* Bridged, take PF_BRIDGE/FORWARD.
++	 * (see big note in front of br_nf_pre_routing_finish)
++	 */
++	if (nf_bridge->mask & BRNF_BRIDGED_DNAT) {
++		okfn = br_forward_finish;
++
++		if (nf_bridge->mask & BRNF_PKT_TYPE) {
++			skb->pkt_type = PACKET_OTHERHOST;
++			nf_bridge->mask ^= BRNF_PKT_TYPE;
++		}
++
++		NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev,
++			skb->dev, okfn);
++	} else {
++		okfn = br_nf_local_out_finish;
++		/* IP forwarded traffic has a physindev, locally
++		 * generated traffic hasn't.
++		 */
++		if (realindev != NULL) {
++			if (((nf_bridge->mask & BRNF_DONT_TAKE_PARENT) == 0) &&
++			    has_bridge_parent(realindev))
++				realindev = bridge_parent(realindev);
++
++			NF_HOOK_THRESH(PF_INET, NF_IP_FORWARD, skb, realindev,
++				       bridge_parent(skb->dev), okfn,
++				       NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD + 1);
++		} else {
++#ifdef CONFIG_NETFILTER_DEBUG
++			skb->nf_debug ^= (1 << NF_IP_LOCAL_OUT);
++#endif
++
++			NF_HOOK_THRESH(PF_INET, NF_IP_LOCAL_OUT, skb, realindev,
++				       bridge_parent(skb->dev), okfn,
++				       NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT + 1);
++		}
++	}
++
++	return NF_STOLEN;
++}
++
++
++/* PF_BRIDGE/POST_ROUTING ********************************************/
++static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	struct sk_buff *skb = *pskb;
++	struct nf_bridge_info *nf_bridge = (*pskb)->nf_bridge;
++
++	/* Be very paranoid. Must be a device driver bug. */
++	if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) {
++		printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "
++				 "bad mac.raw pointer.");
++		if (skb->dev != NULL) {
++			printk("[%s]", skb->dev->name);
++			if (has_bridge_parent(skb->dev))
++				printk("[%s]", bridge_parent(skb->dev)->name);
++		}
++		printk("\n");
++		return NF_ACCEPT;
++	}
++
++	if (skb->protocol != __constant_htons(ETH_P_IP))
++		return NF_ACCEPT;
++
++	/* Sometimes we get packets with NULL ->dst here (for example,
++	 * running a dhcp client daemon triggers this).
++	 */
++	if (skb->dst == NULL)
++		return NF_ACCEPT;
++
++#ifdef CONFIG_NETFILTER_DEBUG
++	skb->nf_debug ^= (1 << NF_IP_POST_ROUTING);
++#endif
++
++	/* We assume any code from br_dev_queue_push_xmit onwards doesn't care
++	 * about the value of skb->pkt_type.
++	 */
++	if (skb->pkt_type == PACKET_OTHERHOST) {
++		skb->pkt_type = PACKET_HOST;
++		nf_bridge->mask |= BRNF_PKT_TYPE;
++	}
++
++	memcpy(nf_bridge->hh, skb->data - 16, 16);
++
++	NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL,
++		bridge_parent(skb->dev), br_dev_queue_push_xmit);
++
++	return NF_STOLEN;
++}
++
++
++/* IPv4/SABOTAGE *****************************************************/
++
++/* Don't hand locally destined packets to PF_INET/PRE_ROUTING
++ * for the second time.
++ */
++static unsigned int ipv4_sabotage_in(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	if (in->hard_start_xmit == br_dev_xmit &&
++	    okfn != br_nf_pre_routing_finish) {
++		okfn(*pskb);
++		return NF_STOLEN;
++	}
++
++	return NF_ACCEPT;
++}
++
++/* Postpone execution of PF_INET/FORWARD, PF_INET/LOCAL_OUT
++ * and PF_INET/POST_ROUTING until we have done the forwarding
++ * decision in the bridge code and have determined skb->physoutdev.
++ */
++static unsigned int ipv4_sabotage_out(unsigned int hook, struct sk_buff **pskb,
++   const struct net_device *in, const struct net_device *out,
++   int (*okfn)(struct sk_buff *))
++{
++	if (out->hard_start_xmit == br_dev_xmit &&
++	    okfn != br_nf_forward_finish &&
++	    okfn != br_nf_local_out_finish &&
++	    okfn != br_dev_queue_push_xmit) {
++		struct sk_buff *skb = *pskb;
++		struct nf_bridge_info *nf_bridge;
++
++		if (!skb->nf_bridge && !nf_bridge_alloc(skb))
++			return NF_DROP;
++
++		nf_bridge = skb->nf_bridge;
++
++		/* This frame will arrive on PF_BRIDGE/LOCAL_OUT and we
++		 * will need the indev then. For a brouter, the real indev
++		 * can be a bridge port, so we make sure br_nf_local_out()
++		 * doesn't use the bridge parent of the indev by using
++		 * the BRNF_DONT_TAKE_PARENT mask.
++		 */
++		if (hook == NF_IP_FORWARD && nf_bridge->physindev == NULL) {
++			nf_bridge->mask &= BRNF_DONT_TAKE_PARENT;
++			nf_bridge->physindev = (struct net_device *)in;
++		}
++		okfn(skb);
++		return NF_STOLEN;
++	}
++
++	return NF_ACCEPT;
++}
++
++/* For br_nf_local_out we need (prio = NF_BR_PRI_FIRST), to insure that innocent
++ * PF_BRIDGE/NF_BR_LOCAL_OUT functions don't get bridged traffic as input.
++ * For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because
++ * ip_refrag() can return NF_STOLEN.
++ */
++static struct nf_hook_ops br_nf_ops[] = {
++	{ .hook = br_nf_pre_routing,
++	  .pf = PF_BRIDGE,
++	  .hooknum = NF_BR_PRE_ROUTING,
++	  .priority = NF_BR_PRI_BRNF, },
++	{ .hook = br_nf_local_in,
++	  .pf = PF_BRIDGE,
++	  .hooknum = NF_BR_LOCAL_IN,
++	  .priority = NF_BR_PRI_BRNF, },
++	{ .hook = br_nf_forward,
++	  .pf = PF_BRIDGE,
++	  .hooknum = NF_BR_FORWARD,
++	  .priority = NF_BR_PRI_BRNF, },
++	{ .hook = br_nf_local_out,
++	  .pf = PF_BRIDGE,
++	  .hooknum = NF_BR_LOCAL_OUT,
++	  .priority = NF_BR_PRI_FIRST, },
++	{ .hook = br_nf_post_routing,
++	  .pf = PF_BRIDGE,
++	  .hooknum = NF_BR_POST_ROUTING,
++	  .priority = NF_BR_PRI_LAST, },
++	{ .hook = ipv4_sabotage_in,
++	  .pf = PF_INET,
++	  .hooknum = NF_IP_PRE_ROUTING,
++	  .priority = NF_IP_PRI_FIRST, },
++	{ .hook = ipv4_sabotage_out,
++	  .pf = PF_INET,
++	  .hooknum = NF_IP_FORWARD,
++	  .priority = NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD, },
++	{ .hook = ipv4_sabotage_out,
++	  .pf = PF_INET,
++	  .hooknum = NF_IP_LOCAL_OUT,
++	  .priority = NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT, },
++	{ .hook = ipv4_sabotage_out,
++	  .pf = PF_INET,
++	  .hooknum = NF_IP_POST_ROUTING,
++	  .priority = NF_IP_PRI_FIRST, },
++};
++
++int br_netfilter_init(void)
++{
++	int i;
++
++	for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) {
++		int ret;
++
++		if ((ret = nf_register_hook(&br_nf_ops[i])) >= 0)
++			continue;
++
++		while (i--)
++			nf_unregister_hook(&br_nf_ops[i]);
++
++		return ret;
++	}
++
++	printk(KERN_NOTICE "Bridge firewalling registered\n");
++
++	return 0;
++}
++
++void br_netfilter_fini(void)
++{
++	int i;
++
++	for (i = ARRAY_SIZE(br_nf_ops) - 1; i >= 0; i--)
++		nf_unregister_hook(&br_nf_ops[i]);
++}
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/ipt_physdev.c	Fri Aug  8 01:09:06 2003
 @@ -0,0 +1,127 @@
 +/* Kernel module to match the bridge port in and
 + * out device for IP packets coming into contact with a bridge. */
@@ -6334,3 +5531,30 @@ diff -Nurb linux.stock/net/ipv4/netfilter/ipt_physdev.c linux/net/ipv4/netfilter
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
 +EXPORT_NO_SYMBOLS;
+--- /dev/null	Thu Aug 24 11:00:32 2000
++++ linux-2.4.21-ebt-brnf-3/include/linux/netfilter_ipv4/ipt_physdev.h	Fri Aug  8 01:09:06 2003
+@@ -0,0 +1,24 @@
++#ifndef _IPT_PHYSDEV_H
++#define _IPT_PHYSDEV_H
++
++#ifdef __KERNEL__
++#include <linux/if.h>
++#endif
++
++#define IPT_PHYSDEV_OP_IN		0x01
++#define IPT_PHYSDEV_OP_OUT		0x02
++#define IPT_PHYSDEV_OP_BRIDGED		0x04
++#define IPT_PHYSDEV_OP_ISIN		0x08
++#define IPT_PHYSDEV_OP_ISOUT		0x10
++#define IPT_PHYSDEV_OP_MASK		(0x20 - 1)
++
++struct ipt_physdev_info {
++	u_int8_t invert;
++	u_int8_t bitmask;
++	char physindev[IFNAMSIZ];
++	char in_mask[IFNAMSIZ];
++	char physoutdev[IFNAMSIZ];
++	char out_mask[IFNAMSIZ];
++};
++
++#endif /*_IPT_PHYSDEV_H*/