From 186df044cdf896131af5fba1f2e4da7a468e79ab Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 9 Apr 2008 18:05:47 +0000 Subject: 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 --- src/or/relay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/or') 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; } -- cgit v1.2.3-54-g00ecf