[netfilter-cvslog] r3831 - in trunk/patch-o-matic-ng/mms-conntrack-nat: . linux-2.6 linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-09 12:19:52 +0200 (Sat, 09 Apr 2005)
New Revision: 3831

Added:
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/
Removed:
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/Documentation/
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd_2
Modified:
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd
   trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2
Log:
add a branch for '2.6.0 <= x < 2.6.11'


Copied: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6 (from rev 3828, trunk/patch-o-matic-ng/mms-conntrack-nat/linux)

Deleted: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd
===================================================================
--- trunk/patch-o-matic-ng/mms-conntrack-nat/linux/net/ipv4/netfilter/Config.in.ladd	2005-04-08 13:36:26 UTC (rev 3828)
+++ trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd	2005-04-09 10:19:52 UTC (rev 3831)
@@ -1,8 +0,0 @@
-          define_tristate CONFIG_IP_NF_NAT_IRC $CONFIG_IP_NF_NAT
-        fi
-      fi
-      if [ "$CONFIG_IP_NF_MMS" = "m" ]; then
-        define_tristate CONFIG_IP_NF_NAT_MMS m
-      else
-        if [ "$CONFIG_IP_NF_MMS" = "y" ]; then
-          define_tristate CONFIG_IP_NF_NAT_MMS $CONFIG_IP_NF_NAT

Deleted: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/mms-conntrack-nat/linux/net/ipv4/netfilter/Config.in.ladd_2	2005-04-08 13:36:26 UTC (rev 3828)
+++ trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Config.in.ladd_2	2005-04-09 10:19:52 UTC (rev 3831)
@@ -1,2 +0,0 @@
-  dep_tristate '  IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
-  dep_tristate '  MMS protocol support' CONFIG_IP_NF_MMS $CONFIG_IP_NF_CONNTRACK

Modified: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd
===================================================================
--- trunk/patch-o-matic-ng/mms-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd	2005-04-08 13:36:26 UTC (rev 3828)
+++ trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd	2005-04-09 10:19:52 UTC (rev 3831)
@@ -1,17 +1,13 @@
-config IP_NF_NAT_MMS
-	tristate
-	depends on IP_NF_CONNTRACK!=n && IP_NF_NAT!=n
-	default IP_NF_NAT if IP_NF_MMS=y
-	default m if IP_NF_MMS=m
-
 config IP_NF_MMS
-	tristate  'MMS protocol support'
-	depends on IP_NF_CONNTRACK
+	tristate 'MMS protocol support'
 	help
 	  Tracking MMS (Microsoft Windows Media Services) connections
 	  could be problematic if random ports are used to send the
 	  streaming content. This option allows users to track streaming
 	  connections over random UDP or TCP ports.
-	
-	  If you want to compile it as a module, say M here and read
-	  <file:Documentation/modules.txt>.  If unsure, say `Y'.
+
+config IP_NF_NAT_MMS
+	tristate
+	depends on IP_NF_NAT!=n && IP_NF_MMS!=n
+	default IP_NF_NAT if IP_NF_MMS=y
+	default m if IP_NF_MMS=m

Modified: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/mms-conntrack-nat/linux/net/ipv4/netfilter/Makefile.ladd	2005-04-08 13:36:26 UTC (rev 3828)
+++ trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2005-04-09 10:19:52 UTC (rev 3831)
@@ -1,2 +1,2 @@
-obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o
-obj-$(CONFIG_IP_NF_NAT_MMS) += ip_nat_mms.o
+# connection tracking helpers
+obj-$(CONFIG_IP_NF_MMS) += ip_conntrack_mms.o

Modified: trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/mms-conntrack-nat/linux/net/ipv4/netfilter/Makefile.ladd_2	2005-04-08 13:36:26 UTC (rev 3828)
+++ trunk/patch-o-matic-ng/mms-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2	2005-04-09 10:19:52 UTC (rev 3831)
@@ -1,5 +1,2 @@
-# connection tracking helpers
-obj-$(CONFIG_IP_NF_MMS) += ip_conntrack_mms.o
-ifdef CONFIG_IP_NF_MMS
-	export-objs += ip_conntrack_mms.o
-endif
+# NAT helpers
+obj-$(CONFIG_IP_NF_NAT_MMS) += ip_nat_mms.o