nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 22:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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


svn:r14329
This commit is contained in:
Nick Mathewson 2008-04-09 18:05:47 +00:00
parent 7519a473da
commit 186df044cd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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 generate a password hash. Fixes bug 643. Bugfix on 0.0.9pre5. Fix
based on patch from Sebastian Hahn. based on patch from Sebastian Hahn.
- When opening a logfile fails, tell us why. - 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: o Minor features:
- Allow separate log levels to be configured for different logging - Allow separate log levels to be configured for different logging

5
src/or/relay.c
View File

@ -1868,7 +1868,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max)
* for us. * for us.
*/ */
assert_active_circuits_ok_paranoid(conn); assert_active_circuits_ok_paranoid(conn);
return n_flushed; goto done;
} }
} }
tor_assert(*next_circ_on_conn_p(circ,conn)); 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."); log_debug(LD_GENERAL, "Made a circuit inactive.");
make_circuit_inactive_on_conn(circ, conn); make_circuit_inactive_on_conn(circ, conn);
} }
done:
if (n_flushed)
conn->timestamp_last_added_nonpadding = time(NULL);
return n_flushed; return n_flushed;
} }