[or-cvs] r14329: When writing relay cells to a buffer, update timestamp_last_ (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-04-09 14:05:47 -0400 (Wed, 09 Apr 2008)
New Revision: 14329

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/relay.c
Log:
 r19262 at 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r19262] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-04-09 09:21:22 UTC (rev 14328)
+++ tor/trunk/ChangeLog	2008-04-09 18:05:47 UTC (rev 14329)
@@ -23,6 +23,9 @@
       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

Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c	2008-04-09 09:21:22 UTC (rev 14328)
+++ tor/trunk/src/or/relay.c	2008-04-09 18:05:47 UTC (rev 14329)
@@ -1868,7 +1868,7 @@
        * 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 @@
     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;
 }