projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom...
[openwrt.git] / target / linux / generic-2.4 / patches / 614-netfilter_nat_rtsp.patch
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 6ae3e7b..6c0184a 100644 (file)
--- 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,6 +1,7 @@
-diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/netfilter/Config.in
---- linux-2.4.32/net/ipv4/netfilter/Config.in  2006-03-01 00:53:57.884792456 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Config.in      2006-03-01 00:55:14.462150928 +0100
+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.916405347 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in        2007-12-15 05:20:10.196421304 +0100
 @@ -16,6 +16,7 @@
    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
@@ -9,7 +10,7 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
  fi
  
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-@@ -119,6 +120,13 @@
+@@ -118,6 +119,13 @@
           define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT
         fi
        fi
@@ -23,9 +24,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/netfilter/Makefile
---- linux-2.4.32/net/ipv4/netfilter/Makefile   2006-03-01 00:53:57.886792152 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Makefile       2006-03-01 00:55:14.463150776 +0100
+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.916405347 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.196421304 +0100
 @@ -57,6 +57,11 @@
  ifdef CONFIG_IP_NF_NAT_H323
         export-objs += ip_conntrack_h323.o
@@ -46,9 +48,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/net
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_rtsp.c
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_rtsp.c    2006-03-01 00:55:14.465150472 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c      2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,507 @@
 +/*
 + * RTSP extension for IP connection tracking
@@ -557,9 +560,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c linux-2.4.32.new/n
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv4/netfilter/ip_nat_rtsp.c
---- linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_nat_rtsp.c  2006-03-01 00:55:14.467150168 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c    2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,621 @@
 +/*
 + * RTSP extension for TCP NAT alteration
@@ -1182,8 +1186,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv
 +
 +module_init(init);
 +module_exit(fini);
---- linux-2.4.32/arch/mips/kernel/mips_ksyms.c 2006-03-01 00:49:34.142887320 +0100
-+++ linux-2.4.32.new/arch/mips/kernel/mips_ksyms.c     2006-03-01 00:55:14.469149864 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c  2007-12-15 05:19:54.695537960 +0100
++++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c       2007-12-15 05:20:10.200421534 +0100
 @@ -52,6 +52,7 @@
  /*
   * String functions
@@ -1192,9 +1198,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv
  EXPORT_SYMBOL_NOVERS(memcmp);
  EXPORT_SYMBOL_NOVERS(memset);
  EXPORT_SYMBOL_NOVERS(memcpy);
-diff -urN linux-2.4.32/include/linux/netfilter_helpers.h linux-2.4.32.new/include/linux/netfilter_helpers.h
---- linux-2.4.32/include/linux/netfilter_helpers.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_helpers.h 2006-03-01 00:55:14.470149712 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_helpers.h   2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,133 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic
@@ -1329,9 +1336,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_helpers.h linux-2.4.32.new/includ
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h  2006-03-01 00:55:14.472149408 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h    2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,68 @@
 +/*
 + * RTSP extension for IP connection tracking.
@@ -1401,9 +1409,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.
 +#endif /* __KERNEL__ */
 +
 +#endif /* _IP_CONNTRACK_RTSP_H */
-diff -urN linux-2.4.32/include/linux/netfilter_mime.h linux-2.4.32.new/include/linux/netfilter_mime.h
---- linux-2.4.32/include/linux/netfilter_mime.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_mime.h    2006-03-01 00:55:14.473149256 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_mime.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_mime.h      2007-12-15 05:20:10.204421761 +0100
 @@ -0,0 +1,90 @@
 +/*
 + * MIME functions for netfilter modules.  This file provides implementations
@@ -1495,8 +1504,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_mime.h linux-2.4.32.new/include/l
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_MIME_H */
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h   2006-03-01 00:53:57.889791696 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h       2006-03-01 01:06:32.178122440 +0100
+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:09.920405577 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.204421761 +0100
 @@ -72,6 +72,7 @@
  #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
  #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
OpenWrt main development branch