diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-19 11:27:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-24 13:04:45 -0400 |
| commit | d6033843a49ff029d9f8d070b3c1f446a6edc9fa (patch) | |
| tree | 1bdd0c5331f654f8d431be1c09c198d009a1ac14 /src/or | |
| parent | 68e430a6fb3056c1265da04fbb08004ddd449525 (diff) | |
| download | tor-d6033843a49ff029d9f8d070b3c1f446a6edc9fa.tar.gz tor-d6033843a49ff029d9f8d070b3c1f446a6edc9fa.zip | |
When looking for conns to close, count the age of linked queued data
Specifically, count the age of the data queued in a linked directory
connection's buffers when counting a stream's age.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuitlist.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index bcdd858be0..68534208c6 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1925,6 +1925,11 @@ circuit_get_streams_max_data_age(const edge_connection_t *stream, uint32_t now) age2 = conn_get_buffer_age(conn, now); if (age2 > age) age = age2; + if (conn->linked_conn) { + age2 = conn_get_buffer_age(conn->linked_conn, now); + if (age2 > age) + age = age2; + } } return age; } |