[netfilter-cvslog] r3963 - in trunk/nfsim-testsuite: 01iptables 02conntrack 03NAT

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-06-05 06:44:41 +0200 (Sun, 05 Jun 2005)
New Revision: 3963

Modified:
   trunk/nfsim-testsuite/01iptables/28ipt_iprange.sim
   trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim
   trunk/nfsim-testsuite/02conntrack/11overload.sim
   trunk/nfsim-testsuite/02conntrack/12amanda.sim
   trunk/nfsim-testsuite/03NAT/05dnat_reply.sim
   trunk/nfsim-testsuite/03NAT/06ip_snat_reply.sim
   trunk/nfsim-testsuite/03NAT/10source-map.sim
Log:
2.4 fixes: add some XFAILS, never send 0-data packets (we did that for unknown protocol tests).  2.4 doesn't track things of < 8 bytes of protocol header.


Modified: trunk/nfsim-testsuite/01iptables/28ipt_iprange.sim
===================================================================
--- trunk/nfsim-testsuite/01iptables/28ipt_iprange.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/01iptables/28ipt_iprange.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -1,3 +1,6 @@
+# iprange is a 2.6 feature.
+# XFAIL:linux:<2.6.0
+
 # Source address belong to this range ?
 iptables -I FORWARD -m iprange --src-range 192.168.0.11-192.168.0.13 -j DROP
 expect gen_ip send:eth1 *

Modified: trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -6,8 +6,8 @@
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 6 1024 1025 SYN
 expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.2 0 17 1024 1025}
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 17 1024 1025
-expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.2 0 2}
-gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 2
+expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.2 8 2}
+gen_ip IF=eth0 192.168.0.2 192.168.1.2 8 2
 
 # Must be related to get through now.
 iptables -A FORWARD -m state ! --state RELATED -j DROP
@@ -20,7 +20,7 @@
 expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
 gen_err IF=eth1 LEN=28 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 17 1024 1025
 expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=20 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 2
+gen_err IF=eth1 LEN=28 192.168.1.2 3 0 192.168.0.2 192.168.1.2 8 2
 
 expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
 gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 1 8 0 55 57
@@ -29,5 +29,5 @@
 expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
 gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 17 1024 1025
 expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=20 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 2
+gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 8 2
 

Modified: trunk/nfsim-testsuite/02conntrack/11overload.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/11overload.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/02conntrack/11overload.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -1,4 +1,6 @@
 # Test overloading connection tracking.
+# Need /proc/net/stat/ip_conntrack
+# XFAIL:linux:<2.6.0 
 
 # FIXME: use module parameters to set hashsize to 1, so we can test collisions.
 # Set stupidly low limit, for testing.

Modified: trunk/nfsim-testsuite/02conntrack/12amanda.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/12amanda.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/02conntrack/12amanda.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -1,5 +1,6 @@
 # Track the AMANDA backup protocol.  UDP port 10080.
-
+# Needs /proc/net/ip_conntrack_expect
+# XFAIL:linux:<2.6.0
 # Test just connection tracking.
 rmmod ip_nat_amanda
 

Modified: trunk/nfsim-testsuite/03NAT/05dnat_reply.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/05dnat_reply.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/03NAT/05dnat_reply.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -11,8 +11,8 @@
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 17 53 53 
 expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.3 0 6 1024 8080 SYN SEQ=1000 WIN=512}
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 6 1024 8080 SYN SEQ=1000 WIN=512
-expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.3 0 2}
-gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 2
+expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.3 8 2}
+gen_ip IF=eth0 192.168.0.2 192.168.1.2 8 2
 
 iptables -t nat -D PREROUTING -s 192.168.0.0/24 -d 192.168.1.2 -j DNAT --to-dest 192.168.1.3
 
@@ -26,5 +26,5 @@
 expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 6 8080 1024 SYN/ACK SEQ=2000 ACK=1001 WIN=512}
 gen_ip IF=eth1 192.168.1.3 192.168.0.2 0 6 8080 1024 SYN/ACK SEQ=2000 ACK=1001 WIN=512
 
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 2}
-gen_ip IF=eth1 192.168.1.3 192.168.0.2 0 2
+expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 8 2}
+gen_ip IF=eth1 192.168.1.3 192.168.0.2 8 2

Modified: trunk/nfsim-testsuite/03NAT/06ip_snat_reply.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/06ip_snat_reply.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/03NAT/06ip_snat_reply.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -8,8 +8,8 @@
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 17 53 53
 expect gen_ip send:eth1 {IPv4 192.168.0.3 192.168.1.2 0 6 1024 8080 SYN SEQ=1000 WIN=512}
 gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 6 1024 8080 SYN SEQ=1000 WIN=512
-expect gen_ip send:eth1 {IPv4 192.168.0.3 192.168.1.2 0 2}
-gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 2
+expect gen_ip send:eth1 {IPv4 192.168.0.3 192.168.1.2 8 2}
+gen_ip IF=eth0 192.168.0.2 192.168.1.2 8 2
 
 iptables -t nat -D POSTROUTING -s 192.168.0.0/24 -d 192.168.1.2 -j SNAT --to-source 192.168.0.3
 
@@ -20,5 +20,5 @@
 gen_ip IF=eth1 192.168.1.2 192.168.0.3 0 17 53 53
 expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 6 8080 1024 SYN/ACK SEQ=2000 ACK=1001 WIN=512}
 gen_ip IF=eth1 192.168.1.2 192.168.0.3 0 6 8080 1024 SYN/ACK SEQ=2000 ACK=1001 WIN=512
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 2}
-gen_ip IF=eth1 192.168.1.2 192.168.0.3 0 2
+expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 8 2}
+gen_ip IF=eth1 192.168.1.2 192.168.0.3 8 2

Modified: trunk/nfsim-testsuite/03NAT/10source-map.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/10source-map.sim	2005-06-05 04:43:10 UTC (rev 3962)
+++ trunk/nfsim-testsuite/03NAT/10source-map.sim	2005-06-05 04:44:41 UTC (rev 3963)
@@ -1,4 +1,6 @@
-# Test that the source port selection for NAT works as we require it.
+# Test that the source port selection for NAT works as we require it
+# Source port matching fixed in 2.6
+# XFAIL:linux:<2.6.0
 
 # The world is out eth1...
 route add 0.0.0.0/0 eth1