Bugfix: we were checking to see if you want to send a keepalive, based

on five minutes since last successful write. But if you have bytes queued
already, and they're not getting through, we were adding a new keepalive
every second. This was bad.


svn:r4296

1 files changed, 1 insertions, 1 deletions

diff --git a/src/or/main.c b/src/or/main.c
index d80ab6fb7..92e26e5cf 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -586,7 +586,7 @@ static void run_connection_housekeeping(int i, time_t now) {
              (int)buf_datalen(conn->outbuf),
              (int)(now-conn->timestamp_lastwritten));
       connection_mark_for_close(conn);
-    } else {
+    } else if (!buf_datalen(conn->outbuf)) {
       /* either in clique mode, or we've got a circuit. send a padding cell. */
       log_fn(LOG_DEBUG,"Sending keepalive to (%s:%d)",
              conn->address, conn->port);