X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f3016ce71f0bbc04af06b7f8be4a4af0fd0269c2..0b686a0ab95aca103224dcbed2e48e6722f07452:/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch?ds=sidebyside diff --git a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch index 7fd2c8b3c..94f11e671 100644 --- a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch +++ b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch @@ -1,16 +1,14 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in -@@ -16,6 +16,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; - 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 +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in +@@ -14,6 +14,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; + dep_tristate ' Connection tracking flow accounting' CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK + 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 ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK + dep_tristate ' RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -118,6 +119,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; +@@ -88,6 +89,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_tristate CONFIG_IP_NF_NAT_H323 $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 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile -@@ -57,6 +57,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -51,6 +51,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack ifdef CONFIG_IP_NF_NAT_H323 export-objs += ip_conntrack_h323.o endif @@ -38,20 +34,18 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile +endif + - # NAT helpers -@@ -67,6 +72,7 @@ obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_ir - obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o - obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o + obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o +@@ -58,6 +63,7 @@ obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_t + obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o + obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o +obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c ++++ b/net/ipv4/netfilter/ip_conntrack_rtsp.c @@ -0,0 +1,507 @@ +/* + * RTSP extension for IP connection tracking @@ -560,10 +554,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c ++++ b/net/ipv4/netfilter/ip_nat_rtsp.c @@ -0,0 +1,621 @@ +/* + * RTSP extension for TCP NAT alteration @@ -1186,10 +1178,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c -+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c +--- a/arch/mips/kernel/mips_ksyms.c ++++ b/arch/mips/kernel/mips_ksyms.c @@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus); /* * String functions @@ -1198,10 +1188,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c EXPORT_SYMBOL_NOVERS(memcmp); EXPORT_SYMBOL_NOVERS(memset); EXPORT_SYMBOL_NOVERS(memcpy); -Index: linux-2.4.35.4/include/linux/netfilter_helpers.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_helpers.h ++++ b/include/linux/netfilter_helpers.h @@ -0,0 +1,133 @@ +/* + * Helpers for netfiler modules. This file provides implementations for basic @@ -1336,10 +1324,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_helpers.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_HELPERS_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h @@ -0,0 +1,68 @@ +/* + * RTSP extension for IP connection tracking. @@ -1409,10 +1395,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h +#endif /* __KERNEL__ */ + +#endif /* _IP_CONNTRACK_RTSP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_mime.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_mime.h ++++ b/include/linux/netfilter_mime.h @@ -0,0 +1,90 @@ +/* + * MIME functions for netfilter modules. This file provides implementations @@ -1504,29 +1488,27 @@ Index: linux-2.4.35.4/include/linux/netfilter_mime.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_MIME_H */ -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 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -@@ -72,6 +72,7 @@ union ip_conntrack_expect_proto { +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h +@@ -68,6 +68,7 @@ union ip_conntrack_expect_proto { + #include #include - #include #include +#include /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -81,6 +82,7 @@ union ip_conntrack_expect_help { +@@ -76,6 +77,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; struct ip_ct_h225_expect exp_h225_info; + struct ip_ct_rtsp_expect exp_rtsp_info; #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -96,6 +98,7 @@ union ip_conntrack_help { +@@ -90,6 +92,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; struct ip_ct_h225_master ct_h225_info; + struct ip_ct_rtsp_master ct_rtsp_info; };