[netfilter-cvslog] r3273 - trunk/nfsim/tools
rusty at netfilter.org
rusty at netfilter.org
Thu Nov 11 03:31:15 CET 2004
Author: rusty at netfilter.org
Date: 2004-11-11 03:31:14 +0100 (Thu, 11 Nov 2004)
New Revision: 3273
Modified:
trunk/nfsim/tools/time.c
Log:
Fix time incrementing code.
Modified: trunk/nfsim/tools/time.c
===================================================================
--- trunk/nfsim/tools/time.c 2004-11-11 02:30:31 UTC (rev 3272)
+++ trunk/nfsim/tools/time.c 2004-11-11 02:31:14 UTC (rev 3273)
@@ -42,27 +42,23 @@
}
if (argc == 2) {
- int inc = 0;
-
if (*argv[1] == '+') {
- inc = atoi(argv[1]+1);
+ increment_time(atoi(argv[1]+1) * HZ);
} else if (*argv[1] == '-') {
- inc = -1 * HZ;
- } else if (streq(argv[1], "infinity")) {
- inc = find_last_timer();
- } else {
- inc = atoi(argv[1]) - jiffies/HZ;
- }
-
- if (inc < 0) {
nfsim_log(LOG_ALWAYS, "Backwards time travel not "
"implemented");
return false;
+ } else if (streq(argv[1], "infinity")) {
+ increment_time(find_last_timer() - jiffies);
+ } else {
+ if (atoi(argv[1]) * HZ < jiffies) {
+ nfsim_log(LOG_ALWAYS,
+ "Flares alert: Backwards time travel not "
+ "implemented");
+ return false;
+ }
+ increment_time(atoi(argv[1]) * HZ - jiffies);
}
-
- if (inc)
- increment_time(inc);
-
return true;
}
More information about the netfilter-cvslog
mailing list