From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Aug 2014 15:27:52 +0000 (-0400)
Subject: When looking for conns to close, count the age of linked queued data
X-Git-Tag: tor-0.2.6.1-alpha~187^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6033843a49ff029d9f8d070b3c1f446a6edc9fa;p=thirdparty%2Ftor.git

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.
---

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;
 }