浏览代码

Fix fencepost error with HearbeatPeriod option

We'd only log every HeartbeatPeriod + 1 seconds. Discovered by Scott
Bennett, reported as bug 4942.
Sebastian Hahn 13 年之前
父节点
当前提交
332e96d109
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 0
      changes/bug4942
  2. 1 1
      src/or/main.c

+ 5 - 0
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.
+

+ 1 - 1
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;
   }