X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/afc90574b4badb77ea9cf1be7393249482e89035..9c0ae271fee1a6f7c9af9690bf228ebc90ad327e:/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch diff --git a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch index 3acc1aadb..76945198d 100644 --- a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch +++ b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch @@ -1,17 +1,23 @@ -Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h -=================================================================== +--- a/include/linux/netfilter/Kbuild ++++ b/include/linux/netfilter/Kbuild +@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h + header-y += nfnetlink_conntrack.h + header-y += nfnetlink_log.h + header-y += nfnetlink_queue.h ++header-y += xt_CHAOS.h + header-y += xt_CLASSIFY.h + header-y += xt_CONNMARK.h + header-y += xt_CONNSECMARK.h --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h ++++ b/include/linux/netfilter/oot_conntrack.h @@ -0,0 +1,5 @@ +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE) +# include +#else /* linux-2.6.20+ */ +# include +#endif -Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h ++++ b/include/linux/netfilter/oot_trans.h @@ -0,0 +1,14 @@ +/* Out of tree workarounds */ +#include @@ -27,10 +33,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h +# define tcp_v4_check(tcph, tcph_sz, s, d, csp) \ + tcp_v4_check((tcph_sz), (s), (d), (csp)) +#endif -Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h ++++ b/include/linux/netfilter/xt_CHAOS.h @@ -0,0 +1,14 @@ +#ifndef _LINUX_NETFILTER_XT_CHAOS_H +#define _LINUX_NETFILTER_XT_CHAOS_H 1 @@ -46,10 +50,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h +}; + +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ -Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h ++++ b/include/linux/netfilter/xt_portscan.h @@ -0,0 +1,8 @@ +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1 @@ -59,10 +61,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h +}; + +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ -Index: linux-2.6.25.4/net/netfilter/find_match.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/find_match.c ++++ b/net/netfilter/find_match.c @@ -0,0 +1,39 @@ +/* + xt_request_find_match @@ -103,10 +103,8 @@ Index: linux-2.6.25.4/net/netfilter/find_match.c + +/* In case it goes into mainline, let this out-of-tree package compile */ +#define xt_request_find_match xt_request_find_match_lo -Index: linux-2.6.25.4/net/netfilter/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/net/netfilter/Kconfig -+++ linux-2.6.25.4/net/netfilter/Kconfig +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig @@ -276,6 +276,14 @@ config NETFILTER_XTABLES # alphabetically ordered list of targets @@ -152,10 +150,8 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_MATCH_MULTIPORT tristate '"multiport" Multiple port match support' depends on NETFILTER_XTABLES -Index: linux-2.6.25.4/net/netfilter/Makefile -=================================================================== ---- linux-2.6.25.4.orig/net/netfilter/Makefile -+++ linux-2.6.25.4/net/netfilter/Makefile +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile @@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o @@ -170,10 +166,8 @@ Index: linux-2.6.25.4/net/netfilter/Makefile obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o -Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c ++++ b/net/netfilter/xt_CHAOS.c @@ -0,0 +1,200 @@ +/* + * CHAOS target for netfilter @@ -375,10 +369,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c +MODULE_DESCRIPTION("netfilter \"CHAOS\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_CHAOS"); -Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c ++++ b/net/netfilter/xt_DELUDE.c @@ -0,0 +1,197 @@ +/* + * DELUDE target @@ -577,10 +569,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c +MODULE_DESCRIPTION("netfilter \"DELUDE\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_DELUDE"); -Index: linux-2.6.25.4/net/netfilter/xt_portscan.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_portscan.c ++++ b/net/netfilter/xt_portscan.c @@ -0,0 +1,269 @@ +/* + * portscan match for netfilter @@ -851,10 +841,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_portscan.c +MODULE_DESCRIPTION("netfilter \"portscan\" match"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_portscan"); -Index: linux-2.6.25.4/drivers/char/random.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/char/random.c -+++ linux-2.6.25.4/drivers/char/random.c +--- a/drivers/char/random.c ++++ b/drivers/char/random.c @@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32 return seq; }