From: Sebastian Hahn <sebastian@torproject.org>
Date: Sun, 22 Jan 2012 12:39:56 +0000 (+0100)
Subject: Fix fencepost error with HearbeatPeriod option
X-Git-Tag: tor-0.2.3.12-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=332e96d1098b00ab21e635a19e9b427d3c735e33;p=thirdparty%2Ftor.git

Fix fencepost error with HearbeatPeriod option

We'd only log every HeartbeatPeriod + 1 seconds. Discovered by Scott
Bennett, reported as bug 4942.
---

diff --git a/changes/bug4942 b/changes/bug4942
new file mode 100644
index 0000000000..012d1051e2
--- /dev/null
+++ b/changes/bug4942
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Actually log the heartbeat message every HeartbeatPeriod seconds, not
+      every HeartbeatPeriod + 1 seconds. Fixes bug 4942; bugfix on
+      0.2.3.1-alpha.. Bug reported by Scott Bennett.
+
diff --git a/src/or/main.c b/src/or/main.c
index 7ef14aaa76..9022f2eb87 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1533,7 +1533,7 @@ run_scheduled_events(time_t now)
 
   /** 12. write the heartbeat message */
   if (options->HeartbeatPeriod &&
-      time_to_next_heartbeat < now) {
+      time_to_next_heartbeat <= now) {
     log_heartbeat(now);
     time_to_next_heartbeat = now+options->HeartbeatPeriod;
   }