[or-cvs] [tor/master 1/2] Fix a couple users of buf_datalen that slipped in. Found by Sebastian

nickm at torproject.org nickm at torproject.org
Thu Oct 14 00:36:59 UTC 2010


Author: Nick Mathewson <nickm at torproject.org>
Date: Wed, 13 Oct 2010 20:36:34 -0400
Subject: Fix a couple users of buf_datalen that slipped in. Found by Sebastian
Commit: 3d10c8920178214520e5900833f5c790129917b0

---
 src/or/relay.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index c645b72..d8ba174 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1512,7 +1512,7 @@ circuit_resume_edge_reading_helper(edge_connection_t *first_conn,
     if (!layer_hint || conn->cpath_layer == layer_hint) {
       connection_start_reading(TO_CONN(conn));
 
-      if (buf_datalen(conn->_base.inbuf) > 0)
+      if (connection_get_inbuf_len(TO_CONN(conn)) > 0)
         ++n_streams;
     }
   }
@@ -1551,7 +1551,7 @@ circuit_resume_edge_reading_helper(edge_connection_t *first_conn,
       }
 
       /* If there's still data to read, we'll be coming back to this stream. */
-      if (buf_datalen(conn->_base.inbuf))
+      if (connection_get_inbuf_len(TO_CONN(conn)))
           ++n_streams_left;
 
       /* If the circuit won't accept any more data, return without looking
-- 
1.7.1




More information about the tor-commits mailing list