[netfilter-cvslog] r3532 - trunk/nfsim-testsuite/01iptables
rusty at netfilter.org
rusty at netfilter.org
Fri Dec 31 09:51:31 CET 2004
Author: rusty at netfilter.org
Date: 2004-12-31 09:51:31 +0100 (Fri, 31 Dec 2004)
New Revision: 3532
Modified:
trunk/nfsim-testsuite/01iptables/40ipt_recent.sh
Log:
Change from < $TMPFILE to just $TMPFILE for better error reporting in nfsim.
nfsim --failtest was complaining about the test ignoring failures: we said we expect one hook to return NF_ACCEPT, but didn't specify anything else, so anything which later dropped a packet was ignored.
Modified: trunk/nfsim-testsuite/01iptables/40ipt_recent.sh
===================================================================
--- trunk/nfsim-testsuite/01iptables/40ipt_recent.sh 2004-12-31 08:42:20 UTC (rev 3531)
+++ trunk/nfsim-testsuite/01iptables/40ipt_recent.sh 2004-12-31 08:51:31 UTC (rev 3532)
@@ -31,6 +31,12 @@
fi
echo expect gen_ip hook:NF_IP_LOCAL_IN iptable_filter $verdict '*'
+ if [ "$verdict" = NF_ACCEPT ]; then
+ # Unless we insist the packet actually complete,
+ # we're ignoring spurious errors inserted by
+ # --failtest, and it complains.
+ echo expect gen_ip send:LOCAL '*'
+ fi
echo gen_ip IF=eth0 192.168.0.$h 192.168.0.1 0 17 1 2
done
@@ -76,6 +82,12 @@
fi
echo expect gen_ip hook:NF_IP_FORWARD iptable_filter $verdict '*'
+ if [ "$verdict" = NF_ACCEPT ]; then
+ # Unless we insist the packet actually complete,
+ # we're ignoring spurious errors inserted by
+ # --failtest, and it complains.
+ echo expect gen_ip send:eth1 '*'
+ fi
echo gen_ip IF=eth0 192.168.0.1 192.168.1.$h 0 17 1 2
done
@@ -191,4 +203,4 @@
done
} > $TMPFILE
-$NFSIM $NFSIM_ARGS < $TMPFILE
+$NFSIM $NFSIM_ARGS $TMPFILE
More information about the netfilter-cvslog
mailing list