[netfilter-cvslog] r3522 - in trunk/nfsim-testsuite: 02conntrack
03NAT
rusty at netfilter.org
rusty at netfilter.org
Thu Dec 30 08:34:42 CET 2004
Author: rusty at netfilter.org
Date: 2004-12-30 08:34:42 +0100 (Thu, 30 Dec 2004)
New Revision: 3522
Modified:
trunk/nfsim-testsuite/02conntrack/00setup.sim
trunk/nfsim-testsuite/02conntrack/01reply.sim
trunk/nfsim-testsuite/02conntrack/02timeout.sim
trunk/nfsim-testsuite/02conntrack/03tcp.sim
trunk/nfsim-testsuite/02conntrack/05loopback.sim
trunk/nfsim-testsuite/02conntrack/07fragments.sim
trunk/nfsim-testsuite/02conntrack/10ftp-pasv.sim
trunk/nfsim-testsuite/02conntrack/10ftp-port.sim
trunk/nfsim-testsuite/03NAT/21loopback.sim
Log:
CONFIG_IP_NF_CONNTRACK_MARK and CONFIG_IP_NF_CT_ACCT change proc output: insert wildcards.
Modified: trunk/nfsim-testsuite/02conntrack/00setup.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/00setup.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/00setup.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -1,10 +1,10 @@
# packet to local interface, new connection
gen_ip IF=eth0 192.168.0.2 192.168.0.1 50 udp 1 2
-expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 use=1
+expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 *use=1
proc cat /proc/net/ip_conntrack
# packet to other interface, new connection.
gen_ip IF=eth0 192.168.0.2 192.168.1.2 50 udp 5 6
-expect proc udp 17 30 src=192.168.0.2 dst=192.168.1.2 sport=5 dport=6 [UNREPLIED] src=192.168.1.2 dst=192.168.0.2 sport=6 dport=5 use=1
+expect proc udp 17 30 src=192.168.0.2 dst=192.168.1.2 sport=5 dport=6 *[UNREPLIED] src=192.168.1.2 dst=192.168.0.2 sport=6 dport=5 *use=1
proc cat /proc/net/ip_conntrack
Modified: trunk/nfsim-testsuite/02conntrack/01reply.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/01reply.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/01reply.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -1,11 +1,11 @@
# Setup
gen_ip IF=eth0 192.168.0.2 192.168.0.1 50 udp 1 2
-expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 use=1
+expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 *use=1
proc cat /proc/net/ip_conntrack
# Reply to previous connection
gen_ip 192.168.0.1 192.168.0.2 50 udp 2 1
expect ! proc UNREPLIED
-expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 use=1
+expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 *src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 *use=1
proc cat /proc/net/ip_conntrack
Modified: trunk/nfsim-testsuite/02conntrack/02timeout.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/02timeout.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/02timeout.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -4,10 +4,10 @@
gen_ip IF=eth0 192.168.0.2 192.168.0.1 50 icmp 8 2 100 200
gen_ip IF=eth0 192.168.0.2 192.168.0.1 50 59
-expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 use=1
-expect proc tcp 6 120 SYN_SENT src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 use=1
-expect proc icmp 1 30 src=192.168.0.2 dst=192.168.0.1 type=8 code=2 id=100 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 type=0 code=2 id=100 use=1
-expect proc unknown 59 600 src=192.168.0.2 dst=192.168.0.1 [UNREPLIED] src=192.168.0.1 dst=192.168.0.2 use=1
+expect proc udp 17 30 src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 *use=1
+expect proc tcp 6 120 SYN_SENT src=192.168.0.2 dst=192.168.0.1 sport=1 dport=2 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 sport=2 dport=1 *use=1
+expect proc icmp 1 30 src=192.168.0.2 dst=192.168.0.1 type=8 code=2 id=100 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 type=0 code=2 id=100 *use=1
+expect proc unknown 59 600 src=192.168.0.2 dst=192.168.0.1 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.2 *use=1
proc cat /proc/net/ip_conntrack
Modified: trunk/nfsim-testsuite/02conntrack/03tcp.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/03tcp.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/03tcp.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -6,19 +6,19 @@
expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 6 1025 80 SYN SEQ=100}
gen_ip IF=eth1 192.168.1.2 192.168.0.2 0 6 1025 80 SYN SEQ=100
-expect proc tcp 6 120 SYN_SENT src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 [UNREPLIED] src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 use=1
+expect proc tcp 6 120 SYN_SENT src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 *[UNREPLIED] src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 *use=1
proc cat /proc/net/ip_conntrack
expect gen_ip send:eth1 {IPv4 192.168.0.2 192.168.1.2 0 6 80 1025 SYN/ACK SEQ=200 ACK=101}
gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 tcp 80 1025 SYN/ACK SEQ=200 ACK=101
-expect proc tcp 6 60 SYN_RECV src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 use=1
+expect proc tcp 6 60 SYN_RECV src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 *src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 *use=1
proc cat /proc/net/ip_conntrack
expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 0 6 1025 80 ACK SEQ=101 ACK=201}
gen_ip IF=eth1 192.168.1.2 192.168.0.2 0 tcp 1025 80 ACK SEQ=101 ACK=201
-expect proc tcp 6 432000 ESTABLISHED src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 [ASSURED] use=1
+expect proc tcp 6 432000 ESTABLISHED src=192.168.1.2 dst=192.168.0.2 sport=1025 dport=80 *src=192.168.0.2 dst=192.168.1.2 sport=80 dport=1025 *[ASSURED] *use=1
proc cat /proc/net/ip_conntrack
# exchange data
Modified: trunk/nfsim-testsuite/02conntrack/05loopback.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/05loopback.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/05loopback.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -5,7 +5,7 @@
expect gen_ip send:lo {IPv4 127.0.0.1 127.0.0.1 0 1 8 0 55 57}
gen_ip 127.0.0.1 127.0.0.1 0 1 8 0 55 57
-expect proc icmp 1 30 src=127.0.0.1 dst=127.0.0.1 type=8 code=0 id=55 [UNREPLIED] src=127.0.0.1 dst=127.0.0.1 type=0 code=0 id=55 use=1
+expect proc icmp 1 30 src=127.0.0.1 dst=127.0.0.1 type=8 code=0 id=55 *[UNREPLIED] src=127.0.0.1 dst=127.0.0.1 type=0 code=0 id=55 *use=1
proc cat /proc/net/ip_conntrack
expect proc 00000001 *
Modified: trunk/nfsim-testsuite/02conntrack/07fragments.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/07fragments.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/07fragments.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -10,7 +10,7 @@
expect gen_ip hook:NF_IP_PRE_ROUTING ip_conntrack NF_ACCEPT {IPv4 192.168.0.2 192.168.1.2 21484 3}
gen_ip IF=eth0 FRAG=32,32 192.168.0.2 192.168.1.2 64 3
-expect proc unknown 3 600 src=192.168.0.2 dst=192.168.1.2 [UNREPLIED] src=192.168.1.2 dst=192.168.0.2 use=1
+expect proc unknown 3 600 src=192.168.0.2 dst=192.168.1.2 *[UNREPLIED] src=192.168.1.2 dst=192.168.0.2 *use=1
proc cat /proc/net/ip_conntrack
time infinity
@@ -26,5 +26,5 @@
expect gen_ip hook:NF_IP_PRE_ROUTING ip_conntrack NF_ACCEPT {IPv4 192.168.0.2 192.168.1.2 21484 3}
gen_ip IF=eth0 FRAG=0,32 MF 192.168.0.2 192.168.1.2 64 3
-expect proc unknown 3 600 src=192.168.0.2 dst=192.168.1.2 [UNREPLIED] src=192.168.1.2 dst=192.168.0.2 use=1
+expect proc unknown 3 600 src=192.168.0.2 dst=192.168.1.2 *[UNREPLIED] src=192.168.1.2 dst=192.168.0.2 *use=1
proc cat /proc/net/ip_conntrack
Modified: trunk/nfsim-testsuite/02conntrack/10ftp-pasv.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/10ftp-pasv.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/10ftp-pasv.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -12,7 +12,7 @@
gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 6 21 1024 SYN/ACK SEQ=1000 ACK=2001 WIN=512
expect gen_ip send:*
gen_ip IF=eth1 192.168.1.2 192.168.0.2 0 6 1024 21 ACK SEQ=2001 ACK=1001 WIN=512
-expect proc tcp 6 432000 ESTABLISHED src=192.168.1.2 dst=192.168.0.2 sport=1024 dport=21 src=192.168.0.2 dst=192.168.1.2 sport=21 dport=1024 [ASSURED] use=1
+expect proc tcp 6 432000 ESTABLISHED src=192.168.1.2 dst=192.168.0.2 sport=1024 dport=21 *src=192.168.0.2 dst=192.168.1.2 sport=21 dport=1024 *[ASSURED] *use=1
proc cat /proc/net/ip_conntrack
# FTP PASV response: won't work because not preceeded by \n.
Modified: trunk/nfsim-testsuite/02conntrack/10ftp-port.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/10ftp-port.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/02conntrack/10ftp-port.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -12,7 +12,7 @@
gen_ip IF=eth1 192.168.1.2 192.168.0.2 0 6 21 1024 SYN/ACK SEQ=2000 ACK=1001 WIN=512
expect gen_ip send:*
gen_ip IF=eth0 192.168.0.2 192.168.1.2 0 6 1024 21 ACK SEQ=1001 ACK=2001 WIN=512
-expect proc tcp 6 432000 ESTABLISHED src=192.168.0.2 dst=192.168.1.2 sport=1024 dport=21 src=192.168.1.2 dst=192.168.0.2 sport=21 dport=1024 [ASSURED] use=1
+expect proc tcp 6 432000 ESTABLISHED src=192.168.0.2 dst=192.168.1.2 sport=1024 dport=21 *src=192.168.1.2 dst=192.168.0.2 sport=21 dport=1024 *[ASSURED] *use=1
proc cat /proc/net/ip_conntrack
# FTP PORT COMMAND: won't work because not preceeded by \n.
Modified: trunk/nfsim-testsuite/03NAT/21loopback.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/21loopback.sim 2004-12-30 07:22:21 UTC (rev 3521)
+++ trunk/nfsim-testsuite/03NAT/21loopback.sim 2004-12-30 07:34:42 UTC (rev 3522)
@@ -11,19 +11,19 @@
expect gen_ip send:eth0 {IPv4 192.168.0.1 192.168.0.2 33 17 100 101}
gen_ip 192.168.0.1 192.168.0.1 33 17 100 101
-expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 [UNREPLIED] src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 *[UNREPLIED] src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
time +15
-expect proc udp 17 15 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 [UNREPLIED] src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 15 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 *[UNREPLIED] src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
# Reply should not cause new conntrack, just refresh this.
expect gen_ip send:LOCAL {IPv4 192.168.0.1 192.168.0.1 33 17 101 100}
gen_ip IF=eth0 192.168.0.2 192.168.0.1 33 17 101 100
-expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.1 sport=100 dport=101 *src=192.168.0.2 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
# After that timeout, we'll be empty.
@@ -40,19 +40,19 @@
expect gen_ip send:lo {IPv4 192.168.0.1 192.168.0.1 33 17 100 101}
gen_ip 192.168.0.1 192.168.0.2 33 17 100 101
-expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 [UNREPLIED] src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
# We will expire this to check that reply doesn't create connection.
time +15
-expect proc udp 17 15 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 [UNREPLIED] src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 15 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 *[UNREPLIED] src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
# Reply should not cause new conntrack.
expect gen_ip send:lo {IPv4 192.168.0.1 192.168.0.1 33 17 101 100}
gen_ip 192.168.0.1 192.168.0.1 33 17 101 100
-expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 use=1
+expect proc udp 17 30 src=192.168.0.1 dst=192.168.0.2 sport=100 dport=101 *src=192.168.0.1 dst=192.168.0.1 sport=101 dport=100 *use=1
proc cat /proc/net/ip_conntrack
# After that timeout, we'll be empty.
More information about the netfilter-cvslog
mailing list