Context Navigation

← Previous Changeset
Next Changeset →

Changeset 196

Timestamp:

12/26/06 13:50:02 (5 years ago)

Author:

root

Message:

New ebtables patch, making ip conntrack a module instead of in-kernel.

Location:

Files:

: 4 modified

Makefile (modified) (1 diff)
configs/config-kernel (modified) (6 diffs)
makefiles/iptables.mk (modified) (1 diff)
patches/kernel/011-latest-ebtables-patch.diff (modified) (79 diffs)

Legend:

: Unmodified
: Added
: Removed

floppyfw-3.0/Makefile

r182	r196
127	127	# This works the same way as NIC_MODULES.
128	128	# If you want options to the module, put them in a () after the module.
129		IPTABLES_MODULES=arp_tables arptable_filter iptable_mangle ipt_DSCP ipt_ECN ipt_LOG ipt_MARK ipt_REDIRECT ipt_TCPMSS ipt_TOS ipt_ULOG ipt_conntrack ipt_connlimit ipt_dscp ipt_ecn ipt_helper ipt_length ipt_limit ipt_mac ipt_mark ipt_physdev ipt_pkttype ipt_tcpmss ipt_tos ipt_ttl ipt_unclean ip_conntrack_ftp ip_nat_ftp ip_conntrack_irc(ports=6666,6667,6668,7000) ip_nat_irc sch_htb ip_conntrack_h323 ip_conntrack_rtsp ip_conntrack_pptp ip_conntrack_quake3 ipt_iprange ipt_multiport
	129	IPTABLES_MODULES=ip_conntrack arp_tables arptable_filter iptable_mangle ipt_DSCP ipt_ECN ipt_LOG ipt_MARK ipt_REDIRECT ipt_TCPMSS ipt_TOS ipt_ULOG ipt_conntrack ipt_connlimit ipt_dscp ipt_ecn ipt_helper ipt_length ipt_limit ipt_mac ipt_mark ipt_physdev ipt_pkttype ipt_tcpmss ipt_tos ipt_ttl ipt_unclean ip_conntrack_ftp ip_nat_ftp ip_conntrack_irc(ports=6666,6667,6668,7000) ip_nat_irc sch_htb ip_conntrack_h323 ip_conntrack_mms ip_nat_mms ip_conntrack_rtsp ip_conntrack_pptp ip_conntrack_quake3 ipt_iprange ipt_multiport
130	130
131	131	#ipt_MIRROR

floppyfw-3.0/configs/config-kernel

r122	r196
209	209	# IP: Netfilter Configuration
210	210	#
211		CONFIG_IP_NF_CONNTRACK=y
	211	CONFIG_IP_NF_CONNTRACK=m
212	212	CONFIG_IP_NF_FTP=m
213	213	CONFIG_IP_NF_CT_PROTO_GRE=m
…	…
220	220	CONFIG_IP_NF_RTSP=m
221	221	CONFIG_IP_NF_QUAKE3=m
222		CONFIG_IP_NF_MMS=y
	222	CONFIG_IP_NF_MMS=m
223	223	CONFIG_IP_NF_CUSEEME=m
224	224	CONFIG_IP_NF_QUEUE=m
…	…
256	256	CONFIG_IP_NF_MATCH_TCPMSS=m
257	257	CONFIG_IP_NF_MATCH_HELPER=m
258		CONFIG_IP_NF_MATCH_STATE=y
	258	CONFIG_IP_NF_MATCH_STATE=m
259	259	CONFIG_IP_NF_MATCH_CONNLIMIT=m
260	260	CONFIG_IP_NF_MATCH_CONNTRACK=m
…	…
266	266	CONFIG_IP_NF_TARGET_MIRROR=m
267	267	CONFIG_IP_NF_TARGET_TARPIT=m
268		CONFIG_IP_NF_NAT=y
	268	CONFIG_IP_NF_NAT=m
269	269	CONFIG_IP_NF_NAT_NEEDED=y
270		CONFIG_IP_NF_TARGET_MASQUERADE=y
	270	CONFIG_IP_NF_TARGET_MASQUERADE=m
271	271	CONFIG_IP_NF_TARGET_REDIRECT=m
272	272	CONFIG_IP_NF_NAT_PPTP=m
…	…
278	278	CONFIG_IP_NF_NAT_IRC=m
279	279	CONFIG_IP_NF_NAT_QUAKE3=m
280		CONFIG_IP_NF_NAT_MMS=y
	280	CONFIG_IP_NF_NAT_MMS=m
281	281	CONFIG_IP_NF_NAT_CUSEEME=m
282	282	CONFIG_IP_NF_NAT_FTP=m
…	…
1325	1325	# Cryptographic options
1326	1326	#
1327		# CONFIG_CRYPTO is not set
1328		# CONFIG_CRYPTO_HMAC is not set
1329		# CONFIG_CRYPTO_NULL is not set
1330		# CONFIG_CRYPTO_MD4 is not set
1331		# CONFIG_CRYPTO_MD5 is not set
1332		# CONFIG_CRYPTO_SHA1 is not set
1333		# CONFIG_CRYPTO_SHA256 is not set
1334		# CONFIG_CRYPTO_SHA512 is not set
1335		# CONFIG_CRYPTO_WP512 is not set
1336		# CONFIG_CRYPTO_DES is not set
1337		# CONFIG_CRYPTO_BLOWFISH is not set
1338		# CONFIG_CRYPTO_TWOFISH is not set
1339		# CONFIG_CRYPTO_SERPENT is not set
1340		# CONFIG_CRYPTO_AES is not set
1341		# CONFIG_CRYPTO_CAST5 is not set
1342		# CONFIG_CRYPTO_CAST6 is not set
1343		# CONFIG_CRYPTO_TEA is not set
1344		# CONFIG_CRYPTO_KHAZAD is not set
1345		# CONFIG_CRYPTO_ANUBIS is not set
1346		# CONFIG_CRYPTO_ARC4 is not set
1347		# CONFIG_CRYPTO_DEFLATE is not set
1348		# CONFIG_CRYPTO_MICHAEL_MIC is not set
1349		# CONFIG_CRYPTO_TEST is not set
	1327	CONFIG_CRYPTO=y
	1328	CONFIG_CRYPTO_HMAC=y
	1329	CONFIG_CRYPTO_NULL=m
	1330	CONFIG_CRYPTO_MD4=m
	1331	CONFIG_CRYPTO_MD5=m
	1332	CONFIG_CRYPTO_SHA1=m
	1333	CONFIG_CRYPTO_SHA256=m
	1334	CONFIG_CRYPTO_SHA512=m
	1335	CONFIG_CRYPTO_WP512=m
	1336	CONFIG_CRYPTO_DES=m
	1337	CONFIG_CRYPTO_BLOWFISH=m
	1338	CONFIG_CRYPTO_TWOFISH=m
	1339	CONFIG_CRYPTO_SERPENT=m
	1340	CONFIG_CRYPTO_AES=m
	1341	CONFIG_CRYPTO_CAST5=m
	1342	CONFIG_CRYPTO_CAST6=m
	1343	CONFIG_CRYPTO_TEA=m
	1344	CONFIG_CRYPTO_KHAZAD=m
	1345	CONFIG_CRYPTO_ANUBIS=m
	1346	CONFIG_CRYPTO_ARC4=m
	1347	CONFIG_CRYPTO_DEFLATE=m
	1348	CONFIG_CRYPTO_MICHAEL_MIC=m
	1349	CONFIG_CRYPTO_TEST=m
1350	1350
1351	1351	#

floppyfw-3.0/makefiles/iptables.mk

r47	r196
5	5	#############################################################
6	6
7		IPTABLES_VERSION=1.3.5
	7	IPTABLES_VERSION=1.3.7
8	8
9	9	IPTABLES_SOURCE_URL=http://netfilter.org/projects/iptables/files/

floppyfw-3.0/patches/kernel/011-latest-ebtables-patch.diff

r1	r196
1		--- linux-2.4.~~29/net/bridge/br_private.h 2004-08-08 01:26:06.000000000 +02~~00
2		+++ linux-2.4.~~29-ebt-brnf/net/bridge/br_private.h 2005-03-14 21:24:04.000000000 +01~~00
	1	--- linux-2.4.31/net/bridge/br_private.h 2004-08-07 23:26:06.000000000 +0000
	2	+++ linux-2.4.31-ebt-brnf/net/bridge/br_private.h 2005-09-15 16:57:22.000000000 +0000
3	3	@@ -143,8 +143,10 @@ extern void br_fdb_insert(struct net_bri
4	4	/* br_forward.c */
…	…
33	33	extern int br_is_root_bridge(struct net_bridge *br);
34	34	extern struct net_bridge_port br_get_port(struct net_bridge br,
35		--- linux-2.4.~~29/include/linux/if_bridge.h 2001-11-22 20:47:12.000000000 +01~~00
36		+++ linux-2.4.~~29-ebt-brnf/include/linux/if_bridge.h 2005-03-14 21:11:28.000000000 +01~~00
	35	--- linux-2.4.31/include/linux/if_bridge.h 2001-11-22 19:47:12.000000000 +0000
	36	+++ linux-2.4.31-ebt-brnf/include/linux/if_bridge.h 2005-09-15 16:57:23.000000000 +0000
37	37	@@ -102,7 +102,8 @@ struct net_bridge;
38	38	struct net_bridge_port;
…	…
45	45	#endif
46	46
47		--- linux-2.4.~~29/net/core/dev.c 2004-04-14 15:05:41.000000000 +02~~00
48		+++ linux-2.4.~~29-ebt-brnf/net/core/dev.c 2005-03-14 00:00:29.000000000 +01~~00
	47	--- linux-2.4.31/net/core/dev.c 2005-04-04 01:42:20.000000000 +0000
	48	+++ linux-2.4.31-ebt-brnf/net/core/dev.c 2005-09-15 16:57:23.000000000 +0000
49	49	@@ -1426,7 +1426,7 @@ static void net_tx_action(struct softirq
50	50
…	…
78	78	#endif
79	79
80		--- linux-2.4.~~29/net/bridge/br_input.c 2003-08-25 13:44:44.000000000 +02~~00
81		+++ linux-2.4.~~29-ebt-brnf/net/bridge/br_input.c 2005-03-14 00:00:29.000000000 +01~~00
	80	--- linux-2.4.31/net/bridge/br_input.c 2003-08-25 11:44:44.000000000 +0000
	81	+++ linux-2.4.31-ebt-brnf/net/bridge/br_input.c 2005-09-22 17:19:52.212834152 +0000
82	82	@@ -24,6 +24,9 @@ unsigned char bridge_ula[6] = { 0x01, 0x
83	83
…	…
99	99	struct net_bridge *br;
100	100	unsigned char *dest;
101		@@ -112,7 +115,7 @@ err_nolock:
	101	@@ -61,6 +64,9 @@ static int br_handle_frame_finish(struct
	102	goto err_nolock;
	103
	104	br = p->br;
	105	+ /* insert into forwarding database after filtering to avoid spoofing */
	106	+ br_fdb_insert(br, p, skb->mac.ethernet->h_source, 0);
	107	+
	108	read_lock(&br->lock);
	109	if (skb->dev->br_port == NULL)
	110	goto err;
	111	@@ -112,7 +118,7 @@ err_nolock:
102	112	return 0;
103	113	}
…	…
108	118	struct net_bridge *br;
109	119	unsigned char *dest;
110		@@ -146,26 +149,35 @@ void br_handle_frame(struct sk_buff *skb
	120	@@ -136,8 +142,7 @@ void br_handle_frame(struct sk_buff *skb
	121	if (skb->mac.ethernet->h_source[0] & 1)
	122	goto err;
	123
	124	- if (p->state == BR_STATE_LEARNING \|\|
	125	- p->state == BR_STATE_FORWARDING)
	126	+ if (p->state == BR_STATE_LEARNING)
	127	br_fdb_insert(br, p, skb->mac.ethernet->h_source, 0);
	128
	129	if (br->stp_enabled &&
	130	@@ -146,26 +151,35 @@ void br_handle_frame(struct sk_buff *skb
111	131	goto handle_special_frame;
112	132
…	…
147	167	+ return 0;
148	168	}
149		--- linux-2.4.29/net/bridge/br_forward.c 2003-11-28 19:26:21.000000000 +0100
150		+++ linux-2.4.29-ebt-brnf/net/bridge/br_forward.c 2005-03-14 00:00:29.000000000 +0100
	169	--- linux-2.4.31/net/bridge/br_stp_bpdu.c 2003-11-28 18:26:21.000000000 +0000
	170	+++ linux-2.4.31-ebt-brnf/net/bridge/br_stp_bpdu.c 2005-09-22 17:20:13.385615400 +0000
	171	@@ -142,6 +142,9 @@ int br_stp_handle_bpdu(struct sk_buff *s
	172
	173	p = skb->dev->br_port;
	174
	175	+ /* insert into forwarding database after filtering to avoid spoofing */
	176	+ br_fdb_insert(p->br, p, skb->mac.ethernet->h_source, 0);
	177	+
	178	if (!p->br->stp_enabled \|\|
	179	!pskb_may_pull(skb, sizeof(header)+1) \|\|
	180	memcmp(skb->data, header, sizeof(header)))
	181	--- linux-2.4.31/net/bridge/br_forward.c 2003-11-28 18:26:21.000000000 +0000
	182	+++ linux-2.4.31-ebt-brnf/net/bridge/br_forward.c 2005-09-15 16:57:23.000000000 +0000
151	183	@@ -30,18 +30,21 @@ static inline int should_deliver(struct
152	184	return 1;
…	…
196	228
197	229	/* called under bridge lock */
198		--- linux-2.4.~~29/net/bridge/br.c 2004-08-08 01:26:06.000000000 +02~~00
199		+++ linux-2.4.~~29-ebt-brnf/net/bridge/br.c 2005-03-14 00:00:29.000000000 +01~~00
	230	--- linux-2.4.31/net/bridge/br.c 2004-08-07 23:26:06.000000000 +0000
	231	+++ linux-2.4.31-ebt-brnf/net/bridge/br.c 2005-09-15 16:57:23.000000000 +0000
200	232	@@ -30,6 +30,8 @@
201	233	#include "../atm/lec.h"
…	…
237	269	module_init(br_init)
238	270	module_exit(br_deinit)
239		--- linux-2.4.~~29/net/bridge/Makefile 2000-12-29 23:07:24.000000000 +01~~00
240		+++ linux-2.4.~~29-ebt-brnf/net/bridge/Makefile 2005-03-14 00:00:29.000000000 +01~~00
	271	--- linux-2.4.31/net/bridge/Makefile 2000-12-29 22:07:24.000000000 +0000
	272	+++ linux-2.4.31-ebt-brnf/net/bridge/Makefile 2005-09-15 16:57:23.000000000 +0000
241	273	@@ -7,10 +7,17 @@
242	274	#
…	…
257	289
258	290	include $(TOPDIR)/Rules.make
259		--- linux-2.4.~~29/include/linux/netfilter_bridge.h 2001-06-12 04:15:27.000000000 +02~~00
260		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge.h 2005-03-14 21:24:06.000000000 +01~~00
	291	--- linux-2.4.31/include/linux/netfilter_bridge.h 2001-06-12 02:15:27.000000000 +0000
	292	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge.h 2005-09-15 16:57:23.000000000 +0000
261	293	@@ -6,6 +6,10 @@
262	294
…	…
270	302	/* Bridge Hooks */
271	303	/* After promisc drops, checksum checks. */
272		@@ -18,7 +22,76 @@
	304	@@ -18,7 +22,89 @@
273	305	#define NF_BR_LOCAL_OUT 3
274	306	/* Packets about to hit the wire. */
…	…
338	370	+ memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
339	371	+}
340
	372	+
341	373	+struct bridge_skb_cb {
342	374	+ union {
…	…
344	376	+ } daddr;
345	377	+};
	378	+
	379
	380	+/* This is called by the IP fragmenting code and it ensures there is
	381	+ * enough room for the encapsulating header (if there is one). */
	382	+static inline
	383	+int nf_bridge_pad(struct sk_buff *skb)
	384	+{
	385	+ if (skb->nf_bridge) {
	386	+ if (skb->protocol == __constant_htons(ETH_P_8021Q))
	387	+ return 4;
	388	+ }
	389	+ return 0;
	390	+}
346	391	+#endif /* CONFIG_NETFILTER */
347	392
348	393	+#endif /* __KERNEL__ */
349	394	#endif
350		--- linux-2.4.~~29/include/linux/netfilter_ipv4/ip_tables.h 2004-08-08 01:26:06.000000000 +02~~00
351		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_ipv4/ip_tables.h 2005-03-14 21:24:28.000000000 +01~~00
	395	--- linux-2.4.31/include/linux/netfilter_ipv4/ip_tables.h 2005-04-04 01:42:20.000000000 +0000
	396	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_ipv4/ip_tables.h 2005-09-15 16:57:23.000000000 +0000
352	397	@@ -159,7 +159,7 @@ struct ipt_entry
353	398	#define IPT_CONTINUE 0xFFFFFFFF
…	…
359	404	/* TCP matching stuff */
360	405	struct ipt_tcp
361		--- linux-2.4.~~29/include/linux/netfilter_ipv6/ip6_tables.h 2004-08-08 01:26:06.000000000 +02~~00
362		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_ipv6/ip6_tables.h 2005-03-14 00:00:29.000000000 +01~~00
363		@@ -16~~7,7 +167~~,7 @@ struct ip6t_entry
	406	--- linux-2.4.31/include/linux/netfilter_ipv6/ip6_tables.h 2005-04-04 01:42:20.000000000 +0000
	407	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_ipv6/ip6_tables.h 2005-09-15 16:57:23.000000000 +0000
	408	@@ -165,7 +165,7 @@ struct ip6t_entry
364	409	#define IP6T_CONTINUE 0xFFFFFFFF
365	410
…	…
370	415	/* TCP matching stuff */
371	416	struct ip6t_tcp
372		--- linux-2.4.~~29/include/linux/netfilter_arp/arp_tables.h 2003-08-25 13:44:44.000000000 +02~~00
373		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_arp/arp_tables.h 2005-03-14 21:24:31.000000000 +01~~00
	417	--- linux-2.4.31/include/linux/netfilter_arp/arp_tables.h 2003-08-25 11:44:44.000000000 +0000
	418	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_arp/arp_tables.h 2005-09-15 16:57:23.000000000 +0000
374	419	@@ -154,7 +154,7 @@ struct arpt_entry
375	420	#define ARPT_CONTINUE 0xFFFFFFFF
…	…
381	426	/* The argument to ARPT_SO_GET_INFO */
382	427	struct arpt_getinfo
383		--- linux-2.4.~~29/net/Makefile 2004-08-08 01:26:06.000000000 +02~~00
384		+++ linux-2.4.~~29-ebt-brnf/net/Makefile 2005-03-14 00:00:29.000000000 +01~~00
	428	--- linux-2.4.31/net/Makefile 2004-08-07 23:26:06.000000000 +0000
	429	+++ linux-2.4.31-ebt-brnf/net/Makefile 2005-09-15 16:57:23.000000000 +0000
385	430	@@ -7,7 +7,8 @@
386	431
…	…
406	451	subdir-$(CONFIG_PACKET) += packet
407	452	subdir-$(CONFIG_NET_SCHED) += sched
408		--- linux-2.4.~~29/net/Config.in 2005-01-19 15:10:13.000000000 +01~~00
409		+++ linux-2.4.~~29-ebt-brnf/net/Config.in 2005-03-14 00:00:29.000000000 +01~~00
	453	--- linux-2.4.31/net/Config.in 2005-01-19 14:10:13.000000000 +0000
	454	+++ linux-2.4.31-ebt-brnf/net/Config.in 2005-09-15 16:57:23.000000000 +0000
410	455	@@ -70,6 +70,9 @@ if [ "$CONFIG_DECNET" != "n" ]; then
411	456	source net/decnet/Config.in
…	…
418	463	tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
419	464	tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
420		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
421		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/Makefile 2005-03-14 00:00:29.000000000 +01~~00
	465	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	466	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/Makefile 2005-09-15 16:57:23.000000000 +0000
422	467	@@ -0,0 +1,34 @@
423	468	+#
…	…
455	500	+obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o
456	501	+include $(TOPDIR)/Rules.make
457		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
458		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/Config.in 2005-03-14 00:00:29.000000000 +01~~00
	502	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	503	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/Config.in 2005-09-15 16:57:23.000000000 +0000
459	504	@@ -0,0 +1,23 @@
460	505	+#
…	…
481	526	+dep_tristate ' ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES
482	527	+dep_tristate ' ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES
483		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
484		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebtable_filter.c 2005-03-14 00:00:29.000000000 +01~~00
	528	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	529	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebtable_filter.c 2005-09-15 16:57:23.000000000 +0000
485	530	@@ -0,0 +1,90 @@
486	531	+/*
…	…
574	619	+EXPORT_NO_SYMBOLS;
575	620	+MODULE_LICENSE("GPL");
576		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
577		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebtable_nat.c 2005-03-14 00:00:29.000000000 +01~~00
	621	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	622	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebtable_nat.c 2005-09-15 16:57:23.000000000 +0000
578	623	@@ -0,0 +1,96 @@
579	624	+/*
…	…
673	718	+EXPORT_NO_SYMBOLS;
674	719	+MODULE_LICENSE("GPL");
675		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
676		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebtable_broute.c 2005-03-14 00:00:29.000000000 +01~~00
	720	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	721	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebtable_broute.c 2005-09-15 16:57:23.000000000 +0000
677	722	@@ -0,0 +1,79 @@
678	723	+/*
…	…
755	800	+EXPORT_NO_SYMBOLS;
756	801	+MODULE_LICENSE("GPL");
757		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
758		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_among.c 2005-03-14 00:00:29.000000000 +01~~00
	802	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	803	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_among.c 2005-09-15 16:57:23.000000000 +0000
759	804	@@ -0,0 +1,223 @@
760	805	+/*
…	…
981	1026	+EXPORT_NO_SYMBOLS;
982	1027	+MODULE_LICENSE("GPL");
983		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
984		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_limit.c 2005-03-14 00:00:29.000000000 +01~~00
	1028	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1029	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_limit.c 2005-09-15 16:57:23.000000000 +0000
985	1030	@@ -0,0 +1,101 @@
986	1031	+/*
…	…
1085	1130	+EXPORT_NO_SYMBOLS;
1086	1131	+MODULE_LICENSE("GPL");
1087		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1088		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_arpreply.c 2005-03-14 00:00:30.000000000 +01~~00
	1132	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1133	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_arpreply.c 2005-09-15 16:57:23.000000000 +0000
1089	1134	@@ -0,0 +1,86 @@
1090	1135	+/*
…	…
1174	1219	+EXPORT_NO_SYMBOLS;
1175	1220	+MODULE_LICENSE("GPL");
1176		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1177		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_802_3.c 2005-03-14 00:00:30.000000000 +01~~00
	1221	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1222	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_802_3.c 2005-09-15 16:57:23.000000000 +0000
1178	1223	@@ -0,0 +1,74 @@
1179	1224	+/*
…	…
1251	1296	+EXPORT_NO_SYMBOLS;
1252	1297	+MODULE_LICENSE("GPL");
1253		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1254		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_mark.c 2005-03-14 00:00:30.000000000 +01~~00
	1298	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1299	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_mark.c 2005-09-15 16:57:23.000000000 +0000
1255	1300	@@ -0,0 +1,66 @@
1256	1301	+/*
…	…
1320	1365	+EXPORT_NO_SYMBOLS;
1321	1366	+MODULE_LICENSE("GPL");
1322		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1323		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_mark_m.c 2005-03-14 00:00:30.000000000 +01~~00
	1367	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1368	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_mark_m.c 2005-09-15 16:57:23.000000000 +0000
1324	1369	@@ -0,0 +1,61 @@
1325	1370	+/*
…	…
1384	1429	+EXPORT_NO_SYMBOLS;
1385	1430	+MODULE_LICENSE("GPL");
1386		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1387		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_pkttype.c 2005-03-14 00:00:30.000000000 +01~~00
	1431	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1432	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_pkttype.c 2005-09-15 16:57:23.000000000 +0000
1388	1433	@@ -0,0 +1,60 @@
1389	1434	+/*
…	…
1447	1492	+EXPORT_NO_SYMBOLS;
1448	1493	+MODULE_LICENSE("GPL");
1449		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1450		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_stp.c 2005-03-14 00:00:30.000000000 +01~~00
	1494	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1495	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_stp.c 2005-09-15 16:57:23.000000000 +0000
1451	1496	@@ -0,0 +1,191 @@
1452	1497	+/*
…	…
1641	1686	+EXPORT_NO_SYMBOLS;
1642	1687	+MODULE_LICENSE("GPL");
1643		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1644		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_redirect.c 2005-03-14 00:00:30.000000000 +01~~00
	1688	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1689	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_redirect.c 2005-09-15 16:57:23.000000000 +0000
1645	1690	@@ -0,0 +1,71 @@
1646	1691	+/*
…	…
1715	1760	+EXPORT_NO_SYMBOLS;
1716	1761	+MODULE_LICENSE("GPL");
1717		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1718		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_arp.c 2005-03-14 00:00:30.000000000 +01~~00
	1762	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1763	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_arp.c 2005-09-15 16:57:23.000000000 +0000
1719	1764	@@ -0,0 +1,149 @@
1720	1765	+/*
…	…
1867	1912	+EXPORT_NO_SYMBOLS;
1868	1913	+MODULE_LICENSE("GPL");
1869		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1870		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_ip.c 2005-03-14 00:00:30.000000000 +01~~00
	1914	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	1915	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_ip.c 2005-09-15 16:57:23.000000000 +0000
1871	1916	@@ -0,0 +1,121 @@
1872	1917	+/*
…	…
1991	2036	+EXPORT_NO_SYMBOLS;
1992	2037	+MODULE_LICENSE("GPL");
1993		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
1994		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_vlan.c 2005-03-14 00:00:30.000000000 +01~~00
	2038	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2039	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_vlan.c 2005-09-15 16:57:23.000000000 +0000
1995	2040	@@ -0,0 +1,259 @@
1996	2041	+/*
…	…
2253	2298	+
2254	2299	+EXPORT_NO_SYMBOLS;
2255		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
2256		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_log.c 2005-03-14 00:00:30.000000000 +01~~00
	2300	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2301	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_log.c 2005-09-15 16:57:23.000000000 +0000
2257	2302	@@ -0,0 +1,153 @@
2258	2303	+/*
…	…
2409	2454	+EXPORT_NO_SYMBOLS;
2410	2455	+MODULE_LICENSE("GPL");
2411		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
2412		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_ulog.c 2005-03-14 00:00:30.000000000 +01~~00
	2456	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2457	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_ulog.c 2005-09-15 16:57:23.000000000 +0000
2413	2458	@@ -0,0 +1,281 @@
2414	2459	+/*
…	…
2693	2738	+MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet"
2694	2739	+ " frames");
2695		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
2696		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_snat.c 2005-03-14 00:00:30.000000000 +01~~00
	2740	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2741	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_snat.c 2005-09-15 16:57:23.000000000 +0000
2697	2742	@@ -0,0 +1,64 @@
2698	2743	+/*
…	…
2760	2805	+EXPORT_NO_SYMBOLS;
2761	2806	+MODULE_LICENSE("GPL");
2762		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
2763		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebt_dnat.c 2005-03-14 00:00:30.000000000 +01~~00
	2807	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2808	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebt_dnat.c 2005-09-15 16:57:23.000000000 +0000
2764	2809	@@ -0,0 +1,65 @@
2765	2810	+/*
…	…
2828	2873	+EXPORT_NO_SYMBOLS;
2829	2874	+MODULE_LICENSE("GPL");
2830		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
2831		+++ linux-2.4.~~29-ebt-brnf/net/bridge/netfilter/ebtables.c 2005-03-14 21:04:05.155913576 +01~~00
	2875	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	2876	+++ linux-2.4.31-ebt-brnf/net/bridge/netfilter/ebtables.c 2005-09-15 16:57:23.000000000 +0000
2832	2877	@@ -0,0 +1,1497 @@
2833	2878	+/*
…	…
4328	4373	+module_exit(fini);
4329	4374	+MODULE_LICENSE("GPL");
4330		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4331		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebtables.h 2005-03-14 21:24:12.000000000 +01~~00
	4375	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4376	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebtables.h 2005-09-15 16:57:23.000000000 +0000
4332	4377	@@ -0,0 +1,361 @@
4333	4378	+/*
…	…
4692	4737	+
4693	4738	+#endif
4694		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4695		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_among.h 2005-03-14 00:00:30.000000000 +01~~00
	4739	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4740	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_among.h 2005-09-15 16:57:23.000000000 +0000
4696	4741	@@ -0,0 +1,65 @@
4697	4742	+#ifndef __LINUX_BRIDGE_EBT_AMONG_H
…	…
4760	4805	+
4761	4806	+#endif
4762		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4763		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_limit.h 2005-03-14 00:00:30.000000000 +01~~00
	4807	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4808	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_limit.h 2005-09-15 16:57:23.000000000 +0000
4764	4809	@@ -0,0 +1,23 @@
4765	4810	+#ifndef __LINUX_BRIDGE_EBT_LIMIT_H
…	…
4786	4831	+
4787	4832	+#endif
4788		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4789		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_arpreply.h 2005-03-14 00:00:30.000000000 +01~~00
	4833	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4834	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_arpreply.h 2005-09-15 16:57:23.000000000 +0000
4790	4835	@@ -0,0 +1,11 @@
4791	4836	+#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
…	…
4800	4845	+
4801	4846	+#endif
4802		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4803		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_802_3.h 2005-03-14 00:00:30.000000000 +01~~00
	4847	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4848	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_802_3.h 2005-09-15 16:57:23.000000000 +0000
4804	4849	@@ -0,0 +1,60 @@
4805	4850	+#ifndef __LINUX_BRIDGE_EBT_802_3_H
…	…
4863	4908	+
4864	4909	+#endif
4865		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4866		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_arp.h 2005-03-14 00:00:30.000000000 +01~~00
	4910	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4911	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_arp.h 2005-09-15 16:57:23.000000000 +0000
4867	4912	@@ -0,0 +1,32 @@
4868	4913	+#ifndef __LINUX_BRIDGE_EBT_ARP_H
…	…
4898	4943	+
4899	4944	+#endif
4900		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4901		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_ip.h 2005-03-14 00:00:30.000000000 +01~~00
	4945	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4946	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_ip.h 2005-09-15 16:57:23.000000000 +0000
4902	4947	@@ -0,0 +1,43 @@
4903	4948	+/*
…	…
4944	4989	+
4945	4990	+#endif
4946		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4947		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_pkttype.h 2005-03-14 00:00:30.000000000 +01~~00
	4991	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	4992	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_pkttype.h 2005-09-15 16:57:23.000000000 +0000
4948	4993	@@ -0,0 +1,11 @@
4949	4994	+#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
…	…
4958	5003	+
4959	5004	+#endif
4960		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
4961		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_stp.h 2005-03-14 00:00:30.000000000 +01~~00
	5005	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5006	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_stp.h 2005-09-15 16:57:23.000000000 +0000
4962	5007	@@ -0,0 +1,46 @@
4963	5008	+#ifndef __LINUX_BRIDGE_EBT_STP_H
…	…
5007	5052	+
5008	5053	+#endif
5009		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5010		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_vlan.h 2005-03-14 00:00:30.000000000 +01~~00
	5054	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5055	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_vlan.h 2005-09-15 16:57:23.000000000 +0000
5011	5056	@@ -0,0 +1,20 @@
5012	5057	+#ifndef __LINUX_BRIDGE_EBT_VLAN_H
…	…
5030	5075	+
5031	5076	+#endif
5032		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5033		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_log.h 2005-03-14 00:00:30.000000000 +01~~00
	5077	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5078	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_log.h 2005-09-15 16:57:23.000000000 +0000
5034	5079	@@ -0,0 +1,17 @@
5035	5080	+#ifndef __LINUX_BRIDGE_EBT_LOG_H
…	…
5050	5095	+
5051	5096	+#endif
5052		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5053		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_ulog.h 2005-03-14 00:00:30.000000000 +01~~00
	5097	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5098	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_ulog.h 2005-09-15 16:57:23.000000000 +0000
5054	5099	@@ -0,0 +1,33 @@
5055	5100	+#ifndef _EBT_ULOG_H
…	…
5086	5131	+
5087	5132	+#endif /* _EBT_ULOG_H */
5088		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5089		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_nat.h 2005-03-14 00:00:30.000000000 +01~~00
	5133	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5134	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_nat.h 2005-09-15 16:57:23.000000000 +0000
5090	5135	@@ -0,0 +1,13 @@
5091	5136	+#ifndef __LINUX_BRIDGE_EBT_NAT_H
…	…
5102	5147	+
5103	5148	+#endif
5104		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5105		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_redirect.h 2005-03-14 00:00:30.000000000 +01~~00
	5149	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5150	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_redirect.h 2005-09-15 16:57:23.000000000 +0000
5106	5151	@@ -0,0 +1,11 @@
5107	5152	+#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
…	…
5116	5161	+
5117	5162	+#endif
5118		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5119		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_m.h 2005-03-14 00:00:30.000000000 +01~~00
	5163	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5164	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_m.h 2005-09-15 16:57:23.000000000 +0000
5120	5165	@@ -0,0 +1,15 @@
5121	5166	+#ifndef __LINUX_BRIDGE_EBT_MARK_M_H
…	…
5134	5179	+
5135	5180	+#endif
5136		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5137		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_t.h 2005-03-14 00:00:30.000000000 +01~~00
	5181	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5182	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_t.h 2005-09-15 16:57:23.000000000 +0000
5138	5183	@@ -0,0 +1,12 @@
5139	5184	+#ifndef __LINUX_BRIDGE_EBT_MARK_T_H
…	…
5149	5194	+
5150	5195	+#endif
5151		--- linux-2.4.~~29/include/linux/netfilter.h 2005-01-19 15:10:12.000000000 +01~~00
5152		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter.h 2005-03-14 21:11:36.000000000 +01~~00
	5196	--- linux-2.4.31/include/linux/netfilter.h 2005-01-19 14:10:12.000000000 +0000
	5197	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter.h 2005-09-15 16:57:23.000000000 +0000
5153	5198	@@ -17,7 +17,8 @@
5154	5199	#define NF_STOLEN 2
…	…
5203	5248	/* Call setsockopt() */
5204	5249	int nf_setsockopt(struct sock sk, int pf, int optval, char opt,
5205		--- linux-2.4.~~29/include/linux/netfilter_ipv4.h 2002-02-25 20:38:13.000000000 +01~~00
5206		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_ipv4.h 2005-03-14 21:11:36.000000000 +01~~00
	5250	--- linux-2.4.31/include/linux/netfilter_ipv4.h 2002-02-25 19:38:13.000000000 +0000
	5251	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_ipv4.h 2005-09-15 16:57:23.000000000 +0000
5207	5252	@@ -52,8 +52,10 @@
5208	5253	enum nf_ip_hook_priorities {
…	…
5216	5261	NF_IP_PRI_NAT_SRC = 100,
5217	5262	NF_IP_PRI_LAST = INT_MAX,
5218		--- linux-2.4.~~29/include/linux/netfilter_ipv6.h 2001-01-02 01:17:54.000000000 +01~~00
5219		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_ipv6.h 2005-03-14 21:24:11.000000000 +01~~00
	5263	--- linux-2.4.31/include/linux/netfilter_ipv6.h 2001-01-02 00:17:54.000000000 +0000
	5264	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_ipv6.h 2005-09-15 16:57:23.000000000 +0000
5220	5265	@@ -57,8 +57,10 @@
5221	5266	enum nf_ip6_hook_priorities {
…	…
5229	5274	NF_IP6_PRI_NAT_SRC = 100,
5230	5275	NF_IP6_PRI_LAST = INT_MAX,
5231		--- linux-2.4.~~29/include/linux/skbuff.h 2004-08-08 01:26:06.000000000 +02~~00
5232		+++ linux-2.4.~~29-ebt-brnf/include/linux/skbuff.h 2005-03-14 21:07:31.000000000 +01~~00
	5276	--- linux-2.4.31/include/linux/skbuff.h 2005-04-04 01:42:20.000000000 +0000
	5277	+++ linux-2.4.31-ebt-brnf/include/linux/skbuff.h 2005-09-15 16:57:23.000000000 +0000
5233	5278	@@ -92,6 +92,20 @@ struct nf_conntrack {
5234	5279	struct nf_ct_info {
…	…
5262	5307
5263	5308	#if defined(CONFIG_HIPPI)
5264		@@ -117~~5,6 +1192~~,20 @@ nf_reset(struct sk_buff *skb)
	5309	@@ -1171,6 +1188,20 @@ nf_reset(struct sk_buff *skb)
5265	5310	skb->nf_debug = 0;
5266	5311	#endif
…	…
5283	5328	static inline void nf_reset(struct sk_buff *skb) {}
5284	5329	#endif /* CONFIG_NETFILTER */
5285		--- linux-2.4.~~29/net/core/netfilter.c 2005-01-19 15:10:13.000000000 +01~~00
5286		+++ linux-2.4.~~29-ebt-brnf/net/core/netfilter.c 2005-03-14 21:21:41.825275416 +01~~00
	5330	--- linux-2.4.31/net/core/netfilter.c 2005-01-19 14:10:13.000000000 +0000
	5331	+++ linux-2.4.31-ebt-brnf/net/core/netfilter.c 2005-09-15 16:57:23.000000000 +0000
5287	5332	@@ -342,32 +342,29 @@ static unsigned int nf_iterate(struct li
5288	5333	const struct net_device *indev,
…	…
5472	5517
5473	5518	switch (verdict) {
5474		--- linux-2.4.~~29/net/core/skbuff.c 2003-08-25 13:44:44.000000000 +02~~00
5475		+++ linux-2.4.~~29-ebt-brnf/net/core/skbuff.c 2005-03-14 00:00:30.000000000 +01~~00
	5519	--- linux-2.4.31/net/core/skbuff.c 2003-08-25 11:44:44.000000000 +0000
	5520	+++ linux-2.4.31-ebt-brnf/net/core/skbuff.c 2005-09-15 16:57:23.000000000 +0000
5476	5521	@@ -246,6 +246,9 @@ static inline void skb_headerinit(void *
5477	5522	#ifdef CONFIG_NETFILTER_DEBUG
…	…
5538	5583	copy_skb_header(n, skb);
5539	5584	return n;
5540		--- linux-2.4.~~29/net/ipv4/netfilter/ip_tables.c 2005-01-19 15:10:13.000000000 +01~~00
5541		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/ip_tables.c 2005-03-14 00:00:30.000000000 +01~~00
5542		@@ -1~~18,12 +118~~,19 @@ static LIST_HEAD(ipt_tables);
	5585	--- linux-2.4.31/net/ipv4/netfilter/ip_tables.c 2005-04-04 01:42:20.000000000 +0000
	5586	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/ip_tables.c 2005-09-15 16:57:23.000000000 +0000
	5587	@@ -120,12 +120,19 @@ static LIST_HEAD(ipt_tables);
5543	5588	static inline int
5544	5589	ip_packet_match(const struct iphdr *ip,
…	…
5560	5605	#define FWINV(bool,invflg) ((bool) ^ !!(ipinfo->invflags & invflg))
5561	5606
5562		@@ -15~~3,7 +160~~,15 @@ ip_packet_match(const struct iphdr *ip,
	5607	@@ -155,7 +162,15 @@ ip_packet_match(const struct iphdr *ip,
5563	5608	& ((const unsigned long *)ipinfo->iniface_mask)[i];
5564	5609	}
…	…
5577	5622	indev, ipinfo->iniface,
5578	5623	ipinfo->invflags&IPT_INV_VIA_IN ?" (INV)":"");
5579		@@ -16~~6,7 +181~~,15 @@ ip_packet_match(const struct iphdr *ip,
	5624	@@ -168,7 +183,15 @@ ip_packet_match(const struct iphdr *ip,
5580	5625	& ((const unsigned long *)ipinfo->outiface_mask)[i];
5581	5626	}
…	…
5594	5639	outdev, ipinfo->outiface,
5595	5640	ipinfo->invflags&IPT_INV_VIA_OUT ?" (INV)":"");
5596		@@ -26~~5,6 +288~~,9 @@ ipt_do_table(struct sk_buff **pskb,
	5641	@@ -267,6 +290,9 @@ ipt_do_table(struct sk_buff **pskb,
5597	5642	/* Initializing verdict to NF_DROP keeps gcc happy. */
5598	5643	unsigned int verdict = NF_DROP;
…	…
5604	5649	struct ipt_entry e, back;
5605	5650
5606		@@ -27~~4,6 +300~~,13 @@ ipt_do_table(struct sk_buff **pskb,
	5651	@@ -276,6 +302,13 @@ ipt_do_table(struct sk_buff **pskb,
5607	5652	datalen = (pskb)->len - ip->ihl 4;
5608	5653	indev = in ? in->name : nulldevname;
…	…
5618	5663	* if it was a normal packet. All other fragments are treated
5619	5664	* normally, except that they will NEVER match rules that ask
5620		@@ -3~~09,7 +342~~,15 @@ ipt_do_table(struct sk_buff **pskb,
	5665	@@ -311,7 +344,15 @@ ipt_do_table(struct sk_buff **pskb,
5621	5666	IP_NF_ASSERT(e);
5622	5667	IP_NF_ASSERT(back);
…	…
5635	5680
5636	5681	if (IPT_MATCH_ITERATE(e, do_match,
5637		--- linux-2.4.29/net/ipv4/ip_output.c 2005-01-19 15:10:13.000000000 +0100
5638		+++ linux-2.4.29-ebt-brnf/net/ipv4/ip_output.c 2005-03-14 00:00:30.000000000 +0100
5639		@@ -890,6 +890,10 @@ int ip_fragment(struct sk_buff *skb, int
	5682	--- linux-2.4.31/net/ipv4/ip_output.c 2005-01-19 14:10:13.000000000 +0000
	5683	+++ linux-2.4.31-ebt-brnf/net/ipv4/ip_output.c 2005-09-15 16:57:23.000000000 +0000
	5684	@@ -77,6 +77,7 @@
	5685	#include <linux/netfilter_ipv4.h>
	5686	#include <linux/mroute.h>
	5687	#include <linux/netlink.h>
	5688	+#include <linux/netfilter_bridge.h>
	5689
	5690	/*
	5691	* Shall we try to damage output packets if routing dev changes?
	5692	@@ -769,7 +770,8 @@ int ip_fragment(struct sk_buff *skb, int
	5693	int not_last_frag;
	5694	struct rtable rt = (struct rtable)skb->dst;
	5695	int err = 0;
	5696	-
	5697	+ unsigned int ll_rs = 0;
	5698	+
	5699	dev = rt->u.dst.dev;
	5700
	5701	/*
	5702	@@ -785,6 +787,10 @@ int ip_fragment(struct sk_buff *skb, int
	5703	hlen = iph->ihl * 4;
	5704	left = skb->len - hlen; /* Space per frame */
	5705	mtu = rt->u.dst.pmtu - hlen; /* Size of data space */
	5706	+#ifdef CONFIG_NETFILTER
	5707	+ ll_rs = nf_bridge_pad(skb);
	5708	+ mtu -= ll_rs;
	5709	+#endif
	5710	ptr = raw + hlen; /* Where to start from */
	5711
	5712	/*
	5713	@@ -812,7 +818,7 @@ int ip_fragment(struct sk_buff *skb, int
	5714	* Allocate buffer.
	5715	*/
	5716
	5717	- if ((skb2 = alloc_skb(len+hlen+dev->hard_header_len+15,GFP_ATOMIC)) == NULL) {
	5718	+ if ((skb2 = alloc_skb(len+hlen+dev->hard_header_len+15+ll_rs,GFP_ATOMIC)) == NULL) {
	5719	NETDEBUG(printk(KERN_INFO "IP: frag: no memory for new fragment!\n"));
	5720	err = -ENOMEM;
	5721	goto fail;
	5722	@@ -824,7 +830,7 @@ int ip_fragment(struct sk_buff *skb, int
	5723
	5724	skb2->pkt_type = skb->pkt_type;
	5725	skb2->priority = skb->priority;
	5726	- skb_reserve(skb2, (dev->hard_header_len+15)&~15);
	5727	+ skb_reserve(skb2, (dev->hard_header_len+15+ll_rs)&~15);
	5728	skb_put(skb2, len + hlen);
	5729	skb2->nh.raw = skb2->data;
	5730	skb2->h.raw = skb2->data + hlen;
	5731	@@ -890,6 +896,10 @@ int ip_fragment(struct sk_buff *skb, int
5640	5732	/* Connection association is same as pre-frag packet */
5641	5733	skb2->nfct = skb->nfct;
…	…
5648	5740	skb2->nf_debug = skb->nf_debug;
5649	5741	#endif
5650		--- linux-2.4.~~29/net/ipv4/netfilter/ipt_LOG.c 2003-11-28 19:26:21.000000000 +01~~00
5651		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/ipt_LOG.c 2005-03-14 00:00:30.000000000 +01~~00
5652		@@ -31~~6,6 +316~~,18 @@ ipt_log_target(struct sk_buff **pskb,
	5742	--- linux-2.4.31/net/ipv4/netfilter/ipt_LOG.c 2005-04-04 01:42:20.000000000 +0000
	5743	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/ipt_LOG.c 2005-09-15 16:57:23.000000000 +0000
	5744	@@ -317,6 +317,18 @@ ipt_log_target(struct sk_buff **pskb,
5653	5745	loginfo->prefix,
5654	5746	in ? in->name : "",
…	…
5669	5761	/* MAC logging for input chain only. */
5670	5762	printk("MAC=");
5671		--- linux-2.4.~~29/net/ipv4/netfilter/Makefile 2003-08-25 13:44:44.000000000 +02~~00
5672		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/Makefile 2005-03-14 00:00:30.000000000 +01~~00
	5763	--- linux-2.4.31/net/ipv4/netfilter/Makefile 2003-08-25 11:44:44.000000000 +0000
	5764	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/Makefile 2005-09-15 16:57:23.000000000 +0000
5673	5765	@@ -87,6 +87,8 @@ obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += i
5674	5766	obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
…	…
5680	5772	obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
5681	5773	obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o
5682		--- linux-2.4.~~29/net/ipv4/netfilter/Config.in 2005-01-19 15:10:13.000000000 +01~~00
5683		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/Config.in 2005-03-14 00:00:30.000000000 +01~~00
	5774	--- linux-2.4.31/net/ipv4/netfilter/Config.in 2005-01-19 14:10:13.000000000 +0000
	5775	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/Config.in 2005-09-15 16:57:23.000000000 +0000
5684	5776	@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
5685	5777	dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
…	…
5692	5784	dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES
5693	5785	if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then
5694		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
5695		+++ linux-2.4.~~29-ebt-brnf/net/bridge/br_netfilter.c 2005-03-14 00:00:30.000000000 +01~~00
5696		@@ -0,0 +1,1101 @@
	5786	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	5787	+++ linux-2.4.31-ebt-brnf/net/bridge/br_netfilter.c 2005-09-15 17:00:24.000000000 +0000
	5788	@@ -0,0 +1,1102 @@
5697	5789	+/*
5698	5790	+ * Handle firewalling
…	…
5925	6017	+
5926	6018	+ if (!ip_route_output(&rt, iph->daddr, 0, iph->tos, 0)) {
5927		+ /* Bridged-and-DNAT'ed traffic doesn't
5928		+ * require ip_forwarding.
5929		+ */
5930		+ if (((struct dst_entry *)rt)->dev == dev) {
	6019	+ /* - Bridged-and-DNAT'ed traffic doesn't
	6020	+ * require ip_forwarding.
	6021	+ * - Deal with redirected traffic. */
	6022	+ if (((struct dst_entry *)rt)->dev == dev \|\|
	6023	+ rt->rt_type == RTN_LOCAL) {
5931	6024	+ skb->dst = (struct dst_entry *)rt;
5932	6025	+ goto bridged_dnat;
…	…
6796	6889	+
6797	6890	+}
6798		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
6799		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/ipt_physdev.c 2005-03-14 00:00:30.000000000 +01~~00
	6891	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	6892	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/ipt_physdev.c 2005-09-15 16:57:23.000000000 +0000
6800	6893	@@ -0,0 +1,127 @@
6801	6894	+/* Kernel module to match the bridge port in and
…	…
6926	7019	+MODULE_LICENSE("GPL");
6927	7020	+EXPORT_NO_SYMBOLS;
6928		--- /dev/null 2005-0~~3-14 20:10:29.001600248 +01~~00
6929		+++ linux-2.4.~~29-ebt-brnf/include/linux/netfilter_ipv4/ipt_physdev.h 2005-03-14 21:24:30.000000000 +01~~00
	7021	--- /dev/null 2005-09-22 15:53:13.374707688 +0000
	7022	+++ linux-2.4.31-ebt-brnf/include/linux/netfilter_ipv4/ipt_physdev.h 2005-09-15 16:57:23.000000000 +0000
6930	7023	@@ -0,0 +1,24 @@
6931	7024	+#ifndef _IPT_PHYSDEV_H
…	…
6953	7046	+
6954	7047	+#endif /_IPT_PHYSDEV_H/
6955		--- linux-2.4.~~29/net/8021q/vlan_dev.c 2005-01-19 15:10:13.000000000 +01~~00
6956		+++ linux-2.4.~~29-ebt-brnf/net/8021q/vlan_dev.c 2005-03-14 00:00:30.000000000 +01~~00
	7048	--- linux-2.4.31/net/8021q/vlan_dev.c 2005-01-19 14:10:13.000000000 +0000
	7049	+++ linux-2.4.31-ebt-brnf/net/8021q/vlan_dev.c 2005-09-15 16:57:23.000000000 +0000
6957	7050	@@ -488,6 +488,10 @@ int vlan_dev_hard_start_xmit(struct sk_b
6958	7051	stats->tx_packets++; /* for statics only */
…	…
6966	7059	dev_queue_xmit(skb);
6967	7060
6968		--- linux-2.4.~~29/include/linux/sysctl.h 2005-01-19 15:10:13.000000000 +01~~00
6969		+++ linux-2.4.~~29-ebt-brnf/include/linux/sysctl.h 2005-03-14 21:07:18.000000000 +01~~00
6970		@@ -60~~8,6 +608~~,15 @@ enum {
	7061	--- linux-2.4.31/include/linux/sysctl.h 2005-04-04 01:42:20.000000000 +0000
	7062	+++ linux-2.4.31-ebt-brnf/include/linux/sysctl.h 2005-09-15 16:57:23.000000000 +0000
	7063	@@ -609,6 +609,15 @@ enum {
6971	7064	NET_DECNET_CONF_DEV_STATE = 7
6972	7065	};
…	…
6984	7077
6985	7078	/* CTL_FS names: */
6986		--- linux-2.4.~~29/net/ipv4/netfilter/ipt_REJECT.c 2005-01-19 15:10:13.000000000 +01~~00
6987		+++ linux-2.4.~~29-ebt-brnf/net/ipv4/netfilter/ipt_REJECT.c 2005-03-14 00:00:30.000000000 +01~~00
	7079	--- linux-2.4.31/net/ipv4/netfilter/ipt_REJECT.c 2005-01-19 14:10:13.000000000 +0000
	7080	+++ linux-2.4.31-ebt-brnf/net/ipv4/netfilter/ipt_REJECT.c 2005-09-15 16:57:23.000000000 +0000
6988	7081	@@ -15,6 +15,9 @@
6989	7082	#include <net/route.h>

Download in other formats: