[netfilter-cvslog] r3544 - in trunk: nfsim/tools
nfsim-testsuite/02conntrack nfsim-testsuite/03NAT
rusty at netfilter.org
rusty at netfilter.org
Sun Jan 2 10:50:37 CET 2005
Author: rusty at netfilter.org
Date: 2005-01-02 10:50:37 +0100 (Sun, 02 Jan 2005)
New Revision: 3544
Modified:
trunk/nfsim-testsuite/02conntrack/11overload.sim
trunk/nfsim-testsuite/03NAT/21loopback.sim
trunk/nfsim/tools/time.c
Log:
"time infinity" was undocumented. Change to "time +infinity" and document.
Modified: trunk/nfsim/tools/time.c
===================================================================
--- trunk/nfsim/tools/time.c 2005-01-02 09:27:55 UTC (rev 3543)
+++ trunk/nfsim/tools/time.c 2005-01-02 09:50:37 UTC (rev 3544)
@@ -75,11 +75,16 @@
<para>Query or advance the kernel time</para>
<cmdsynopsis>
<command>time</command>
- <sbr/>
+ </cmdsynopsis>
+ <cmdsynopsis>
<command>time</command>
<arg choice="req"><replaceable>time</replaceable></arg>
<arg choice="req">+<replaceable>advance</replaceable></arg>
</cmdsynopsis>
+ <cmdsynopsis>
+ <command>time</command>
+ <arg choice="req">+intinife</arg>
+ </cmdsynopsis>
<para><command>time</command> with no arguments will show the current
kernel time (in seconds).</para>
<para><command>time <replaceable>time</replaceable></command> will set the
@@ -92,6 +97,13 @@
<screen><![CDATA[> time +30
running timer to ip_conntrack_core.c:init_conntrack()
>]]></screen></para>
+ <para>
+ The <command>time
+ +<replaceable>infinity</replaceable></command> command will
+ forward time past all the currently pending timers, leaving a
+ clean slate.
+ </para>
+
</section>
*/
}
Modified: trunk/nfsim-testsuite/02conntrack/11overload.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/11overload.sim 2005-01-02 09:27:55 UTC (rev 3543)
+++ trunk/nfsim-testsuite/02conntrack/11overload.sim 2005-01-02 09:50:37 UTC (rev 3544)
@@ -24,7 +24,7 @@
proc cat /proc/net/stat/ip_conntrack
# Now, do it again, with assured TCP connections.
-time infinity
+time +infinity
tcpsession OPEN 192.168.0.2 192.168.1.2 1 2
tcpsession ABANDON
Modified: trunk/nfsim-testsuite/03NAT/21loopback.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/21loopback.sim 2005-01-02 09:27:55 UTC (rev 3543)
+++ trunk/nfsim-testsuite/03NAT/21loopback.sim 2005-01-02 09:50:37 UTC (rev 3544)
@@ -27,7 +27,7 @@
proc cat /proc/net/ip_conntrack
# After that timeout, we'll be empty.
-time infinity
+time +infinity
expect ! proc *
proc cat /proc/net/ip_conntrack
More information about the netfilter-cvslog
mailing list