X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/90fba37c49479ed4e5233dc0d348cdf7d24c9ee1..9486190f3fabf8b68fd943ab814c16c303c4177b:/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch diff --git a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch index 553d1151d..cb23abde6 100644 --- a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch +++ b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch @@ -1,8 +1,6 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.644389846 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.916405347 +0100 -@@ -15,6 +15,7 @@ +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in +@@ -15,6 +15,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE @@ -10,7 +8,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -110,6 +111,13 @@ +@@ -110,6 +111,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT fi fi @@ -24,11 +22,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT fi -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.644389846 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.916405347 +0100 -@@ -53,6 +53,10 @@ +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -53,6 +53,10 @@ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack ifdef CONFIG_IP_NF_NAT_PPTP export-objs += ip_conntrack_pptp.o endif @@ -39,7 +35,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # NAT helpers -@@ -62,6 +66,7 @@ +@@ -62,6 +66,7 @@ obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ft obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o @@ -47,10 +43,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ b/net/ipv4/netfilter/ip_conntrack_h323.c @@ -0,0 +1,302 @@ +/* + * H.323 'brute force' extension for H.323 connection tracking. @@ -354,10 +348,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ b/net/ipv4/netfilter/ip_nat_h323.c @@ -0,0 +1,403 @@ +/* + * H.323 'brute force' extension for NAT alteration. @@ -762,11 +754,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:08.704336275 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:09.920405577 +0100 -@@ -71,6 +71,7 @@ +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h +@@ -71,6 +71,7 @@ union ip_conntrack_expect_proto { #include #include #include @@ -774,7 +764,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -79,6 +80,7 @@ +@@ -79,6 +80,7 @@ union ip_conntrack_expect_help { struct ip_ct_ftp_expect exp_ftp_info; struct ip_ct_irc_expect exp_irc_info; struct ip_ct_pptp_expect exp_pptp_info; @@ -782,7 +772,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -93,6 +95,7 @@ +@@ -93,6 +95,7 @@ union ip_conntrack_help { struct ip_ct_ftp_master ct_ftp_info; struct ip_ct_irc_master ct_irc_info; struct ip_ct_pptp_master ct_pptp_info; @@ -790,10 +780,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; #ifdef CONFIG_IP_NF_NAT_NEEDED -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h @@ -0,0 +1,30 @@ +#ifndef _IP_CONNTRACK_H323_H +#define _IP_CONNTRACK_H323_H