diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-07-31 11:39:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 12:28:43 -0400 |
commit | 200921dc313c7077c5d36aeda4b885e18c29fa70 (patch) | |
tree | 6888b68bdcf6872d2e75aa8d44fa88503b0707da /src/or/connection_or.c | |
parent | 57e7b54b7b4102de0c5776a1268367c18090033b (diff) | |
download | tor-200921dc313c7077c5d36aeda4b885e18c29fa70.tar.gz tor-200921dc313c7077c5d36aeda4b885e18c29fa70.zip |
Refactor users of buf_datalen to bufferevent-friendly version.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r-- | src/or/connection_or.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6b648b124d..cb2c429e9a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -248,7 +248,7 @@ connection_or_process_inbuf(or_connection_t *conn) int connection_or_flushed_some(or_connection_t *conn) { - size_t datalen = buf_datalen(conn->_base.outbuf); + size_t datalen = connection_get_outbuf_len(TO_CONN(conn)); /* If we're under the low water mark, add cells until we're just over the * high water mark. */ if (datalen < OR_CONN_LOWWATER) { @@ -1277,7 +1277,7 @@ connection_or_process_cells_from_inbuf(or_connection_t *conn) while (1) { log_debug(LD_OR, "%d: starting, inbuf_datalen %d (%d pending in tls object).", - conn->_base.s,(int)buf_datalen(conn->_base.inbuf), + conn->_base.s,(int)connection_get_inbuf_len(TO_CONN(conn)), tor_tls_get_pending_bytes(conn->tls)); if (connection_fetch_var_cell_from_buf(conn, &var_cell)) { if (!var_cell) @@ -1288,8 +1288,8 @@ connection_or_process_cells_from_inbuf(or_connection_t *conn) } else { char buf[CELL_NETWORK_SIZE]; cell_t cell; - if (buf_datalen(conn->_base.inbuf) < CELL_NETWORK_SIZE) /* whole response - available? */ + if (connection_get_inbuf_len(TO_CONN(conn)) + < CELL_NETWORK_SIZE) /* whole response available? */ return 0; /* not yet */ circuit_build_times_network_is_live(&circ_times); |