diff --git a/patches/ct_sync_config_and_makefile.patch b/patches/ct_sync_config_and_makefile.patch index 0750c37..b5877ec 100644 --- a/patches/ct_sync_config_and_makefile.patch +++ b/patches/ct_sync_config_and_makefile.patch @@ -2,7 +2,7 @@ Index: netfilter-2.6.14/net/ipv4/netfilt =================================================================== --- netfilter-2.6.14.orig/net/ipv4/netfilter/Makefile 2005-09-18 12:58:03.203433272 +0200 +++ netfilter-2.6.14/net/ipv4/netfilter/Makefile 2005-10-04 16:23:02.759253880 +0200 -@@ -6,6 +6,9 @@ +@@ -16,6 +16,9 @@ ip_conntrack-objs := ip_conntrack_standalone.o ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o iptable_nat-objs := ip_nat_standalone.o ip_nat_rule.o ip_nat_core.o ip_nat_helper.o ip_nat_proto_unknown.o ip_nat_proto_tcp.o ip_nat_proto_udp.o ip_nat_proto_icmp.o diff --git a/patches/export_ip_conntrack_clean_from_lists.patch b/patches/export_ip_conntrack_clean_from_lists.patch index 587fdee..42dd8e7 100644 --- a/patches/export_ip_conntrack_clean_from_lists.patch +++ b/patches/export_ip_conntrack_clean_from_lists.patch @@ -1,19 +1,19 @@ -Index: netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_standalone.c -=================================================================== ---- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-10-04 17:39:05.224653712 +0200 -+++ netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-10-04 17:40:29.406856072 +0200 -@@ -1008,6 +1008,7 @@ - EXPORT_SYMBOL(ip_conntrack_hash); - EXPORT_SYMBOL(ip_conntrack_untracked); - EXPORT_SYMBOL_GPL(ip_conntrack_find_get); +Index: linux-2.6.15.4/net/ipv4/netfilter/ip_conntrack_standalone.c +=================================================================== +--- linux-2.6.15.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-10 20:54:00.490973576 +0100 ++++ linux-2.6.15.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-10 20:54:18.557227088 +0100 +@@ -990,6 +990,7 @@ + + EXPORT_SYMBOL_GPL(ip_conntrack_flush); + EXPORT_SYMBOL_GPL(__ip_conntrack_find); +EXPORT_SYMBOL_GPL(ip_conntrack_clean_from_lists); - #ifdef CONFIG_IP_NF_NAT_NEEDED - EXPORT_SYMBOL(ip_conntrack_tcp_update); - #endif -Index: netfilter-2.6.14/include/linux/netfilter_ipv4/ip_conntrack_core.h -=================================================================== ---- netfilter-2.6.14.orig/include/linux/netfilter_ipv4/ip_conntrack_core.h 2005-10-04 17:39:05.228653104 +0200 -+++ netfilter-2.6.14/include/linux/netfilter_ipv4/ip_conntrack_core.h 2005-10-04 17:39:29.208007688 +0200 + + EXPORT_SYMBOL_GPL(ip_conntrack_alloc); + EXPORT_SYMBOL_GPL(ip_conntrack_free); +Index: linux-2.6.15.4/include/linux/netfilter_ipv4/ip_conntrack_core.h +=================================================================== +--- linux-2.6.15.4.orig/include/linux/netfilter_ipv4/ip_conntrack_core.h 2005-01-10 20:54:00.492973272 +0100 ++++ linux-2.6.15.4/include/linux/netfilter_ipv4/ip_conntrack_core.h 2005-01-10 20:54:18.559226784 +0100 @@ -54,6 +54,8 @@ extern void ip_ct_unlink_expect(struct ip_conntrack_expect *exp); @@ -23,11 +23,11 @@ Index: netfilter-2.6.14/include/linux/ne extern struct list_head *ip_conntrack_hash; extern struct list_head ip_conntrack_expect_list; extern rwlock_t ip_conntrack_lock; -Index: netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_core.c -=================================================================== ---- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_conntrack_core.c 2005-10-04 17:39:05.226653408 +0200 -+++ netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_core.c 2005-10-04 17:39:29.215006624 +0200 -@@ -288,12 +288,12 @@ +Index: linux-2.6.15.4/net/ipv4/netfilter/ip_conntrack_core.c +=================================================================== +--- linux-2.6.15.4.orig/net/ipv4/netfilter/ip_conntrack_core.c 2005-01-10 20:54:00.497972512 +0100 ++++ linux-2.6.15.4/net/ipv4/netfilter/ip_conntrack_core.c 2005-01-10 20:56:56.733180688 +0100 +@@ -292,12 +292,12 @@ } } @@ -43,7 +43,16 @@ Index: netfilter-2.6.14/net/ipv4/netfilt ASSERT_WRITE_LOCK(&ip_conntrack_lock); ho = hash_conntrack(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); -@@ -359,7 +359,7 @@ +@@ -333,7 +333,7 @@ + ip_conntrack_destroyed(ct); + + write_lock_bh(&ip_conntrack_lock); +- /* Expectations will have been removed in clean_from_lists, ++ /* Expectations will have been removed in ip_conntrack_clean_from_lists, + * except TFTP can create an expectation on the first packet, + * before connection is in the list, so we need to clean here, + * too. */ +@@ -363,7 +363,7 @@ /* Inside lock so preempt is disabled on module removal path. * Otherwise we can get spurious warnings. */ CONNTRACK_STAT_INC(delete_list); diff --git a/patches/export_ip_nat_lock_and_hash.patch b/patches/export_ip_nat_lock_and_hash.patch index ed1997c..2168a34 100644 --- a/patches/export_ip_nat_lock_and_hash.patch +++ b/patches/export_ip_nat_lock_and_hash.patch @@ -1,19 +1,8 @@ -Index: netfilter-2.6.14/net/ipv4/netfilter/ip_nat_standalone.c -=================================================================== ---- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_nat_standalone.c 2005-10-04 17:39:04.943696424 +0200 -+++ netfilter-2.6.14/net/ipv4/netfilter/ip_nat_standalone.c 2005-10-04 17:39:15.274125960 +0200 -@@ -405,4 +405,6 @@ - EXPORT_SYMBOL(ip_nat_mangle_udp_packet); - EXPORT_SYMBOL(ip_nat_used_tuple); - EXPORT_SYMBOL(ip_nat_follow_master); -+EXPORT_SYMBOL_GPL(ip_nat_lock); -+EXPORT_SYMBOL_GPL(ip_nat_hash_insert); - MODULE_LICENSE("GPL"); -Index: netfilter-2.6.14/net/ipv4/netfilter/ip_nat_core.c -=================================================================== ---- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_nat_core.c 2005-10-04 17:39:04.944696272 +0200 -+++ netfilter-2.6.14/net/ipv4/netfilter/ip_nat_core.c 2005-10-04 17:56:57.845590544 +0200 -@@ -101,6 +101,18 @@ +Index: linux-2.6.15.4/net/ipv4/netfilter/ip_nat_core.c +=================================================================== +--- linux-2.6.15.4.orig/net/ipv4/netfilter/ip_nat_core.c 2005-10-04 17:39:04.944696272 +0200 ++++ linux-2.6.15.4/net/ipv4/netfilter/ip_nat_core.c 2005-10-04 17:56:57.845590544 +0200 +@@ -101,6 +101,19 @@ write_unlock_bh(&ip_nat_lock); } @@ -28,11 +17,12 @@ Index: netfilter-2.6.14/net/ipv4/netfilt + list_add(&ct->nat.info.bysource, &bysource[srchash]); + write_unlock_bh(&ip_nat_lock); +} ++EXPORT_SYMBOL_GPL(ip_nat_hash_insert); + /* We do checksum mangling, so if they were wrong before they're still * wrong. Also works for incomplete packets (eg. ICMP dest * unreachables.) */ -@@ -295,7 +307,6 @@ +@@ -297,7 +311,6 @@ unsigned int hooknum) { struct ip_conntrack_tuple curr_tuple, new_tuple; @@ -40,7 +30,7 @@ Index: netfilter-2.6.14/net/ipv4/netfilt int have_to_hash = !(conntrack->status & IPS_NAT_DONE_MASK); enum ip_nat_manip_type maniptype = HOOK2MANIP(hooknum); -@@ -330,14 +341,8 @@ +@@ -332,14 +345,8 @@ } /* Place in source hash if this is the first time. */ @@ -57,14 +47,14 @@ Index: netfilter-2.6.14/net/ipv4/netfilt /* It's done. */ if (maniptype == IP_NAT_MANIP_DST) -Index: netfilter-2.6.14/include/linux/netfilter_ipv4/ip_nat_core.h -=================================================================== ---- netfilter-2.6.14.orig/include/linux/netfilter_ipv4/ip_nat_core.h 2005-10-04 17:39:04.946695968 +0200 -+++ netfilter-2.6.14/include/linux/netfilter_ipv4/ip_nat_core.h 2005-10-04 17:39:15.282124744 +0200 -@@ -17,4 +17,7 @@ - struct ip_conntrack *ct, - enum ip_nat_manip_type manip, - enum ip_conntrack_dir dir); +Index: linux-2.6.15.4/include/linux/netfilter_ipv4/ip_nat_core.h +=================================================================== +--- linux-2.6.15.4.orig/include/linux/netfilter_ipv4/ip_nat_core.h 2005-10-04 17:39:04.946695968 +0200 ++++ linux-2.6.15.4/include/linux/netfilter_ipv4/ip_nat_core.h 2005-10-04 17:39:15.282124744 +0200 +@@ -15,4 +15,7 @@ + struct ip_conntrack *ct, + enum ip_nat_manip_type manip, + enum ip_conntrack_dir dir); + +extern void ip_nat_hash_insert(struct ip_conntrack *ct); + diff --git a/patches/inet_pton6.patch b/patches/inet_pton6.patch index a8a2c25..9570732 100644 --- a/patches/inet_pton6.patch +++ b/patches/inet_pton6.patch @@ -11,7 +11,7 @@ Index: netfilter-2.6.14/include/linux/in @@ -46,5 +46,7 @@ #include - extern __u32 in_aton(const char *str); + extern __be32 in_aton(const char *str); +extern int inet_pton4(const char *src, unsigned char *dst); +extern int inet_pton6(const char *src, unsigned char *dst); #endif diff --git a/patches/netfilter_sysfs.patch b/patches/netfilter_sysfs.patch index 7f51d82..5a34d61 100644 --- a/patches/netfilter_sysfs.patch +++ b/patches/netfilter_sysfs.patch @@ -2,8 +2,8 @@ Index: netfilter-2.6.14/include/linux/ne =================================================================== --- netfilter-2.6.14.orig/include/linux/netfilter.h 2005-09-18 12:57:51.132268368 +0200 +++ netfilter-2.6.14/include/linux/netfilter.h 2005-10-06 18:10:11.833926224 +0200 -@@ -271,5 +271,20 @@ - static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} +@@ -335,5 +335,20 @@ + nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, int family) {} #endif /*CONFIG_NETFILTER*/ +struct nf_kset { @@ -25,29 +25,29 @@ Index: netfilter-2.6.14/include/linux/ne #endif /*__LINUX_NETFILTER_H*/ Index: netfilter-2.6.14/include/linux/netfilter_ipv4/ip_tables.h =================================================================== ---- netfilter-2.6.14.orig/include/linux/netfilter_ipv4/ip_tables.h 2005-09-18 12:57:51.292244048 +0200 -+++ netfilter-2.6.14/include/linux/netfilter_ipv4/ip_tables.h 2005-10-06 18:12:51.100713992 +0200 -@@ -364,6 +364,8 @@ +--- a/include/linux/netfilter/x_tables.h 2006-04-05 00:00:28.000000000 +0200 ++++ b/include/linux/netfilter/x_tables.h 2006-04-05 01:07:58.000000000 +0200 +@@ -194,6 +194,8 @@ + unsigned short family; u_int8_t revision; - -+ struct kobject kobj; + - /* Return true or false: return FALSE and set *hotdrop = 1 to - force immediate packet drop. */ - /* Arguments changed since 2.4, as this must now handle -@@ -400,6 +402,8 @@ ++ struct kobject kobj; + }; - u_int8_t revision; + /* Registration hooks for targets. */ +@@ -242,6 +244,8 @@ -+ struct kobject kobj; + unsigned short family; + u_int8_t revision; + - /* Called when user tries to insert an entry of this type: - hook_mask is a bitmask of hooks from which it can be - called. */ -@@ -441,6 +445,8 @@ ++ struct kobject kobj; + }; + + /* Furniture shopping... */ +@@ -252,6 +256,8 @@ /* A unique name... */ - char name[IPT_TABLE_MAXNAMELEN]; + char name[XT_TABLE_MAXNAMELEN]; + struct kobject kobj; + @@ -59,9 +59,9 @@ Index: netfilter-2.6.14/net/ipv4/netfilt --- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_tables.c 2005-09-18 12:58:03.791343896 +0200 +++ netfilter-2.6.14/net/ipv4/netfilter/ip_tables.c 2005-10-06 19:49:59.300692920 +0200 @@ -11,12 +11,16 @@ - * 19 Jan 2002 Harald Welte - * - increase module usage count as soon as we have rules inside - * a table + * a table + * 08 Oct 2005 Harald Welte + * - Generalize into "x_tables" layer and "{ip,ip6,arp}_tables" + * 07 Mar 2005 Harald Welte + * - add sysfs interface */ diff --git a/patches/series b/patches/series index 19ed278..66d7e26 100644 --- a/patches/series +++ b/patches/series @@ -1,6 +1,5 @@ export_ip_nat_lock_and_hash.patch export_ip_conntrack_clean_from_lists.patch -conntrack_hash_manip.patch netfilter_sysfs.patch inet_pton6.patch ct_sync_config_and_makefile.patch