r19262@catbus: nickm | 2008-04-09 14:05:20 -0400

 When writing relay cells to a buffer, update timestamp_last_added_nonpadding.  Bugfix on 0.2.0.1-alpha. Backport candidate.


svn:r14329

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index da2063c685..da8ff47d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
       generate a password hash.  Fixes bug 643. Bugfix on 0.0.9pre5.  Fix
       based on patch from Sebastian Hahn.
     - When opening a logfile fails, tell us why.
+    - Make relay cells written on a connection count as non-padding when
+      tracking how long a connection has been in use. Bugfix on
+      0.2.0.1-alpha.  Spotted by lodger.
 
   o Minor features:
     - Allow separate log levels to be configured for different logging
diff --git a/src/or/relay.c b/src/or/relay.c
index db7d1a3d77..539bc8092b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1868,7 +1868,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max)
        * for us.
        */
       assert_active_circuits_ok_paranoid(conn);
-      return n_flushed;
+      goto done;
     }
   }
   tor_assert(*next_circ_on_conn_p(circ,conn));
@@ -1885,6 +1885,9 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max)
     log_debug(LD_GENERAL, "Made a circuit inactive.");
     make_circuit_inactive_on_conn(circ, conn);
   }
+ done:
+  if (n_flushed)
+    conn->timestamp_last_added_nonpadding = time(NULL);
   return n_flushed;
 }