summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-13 16:05:22 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-13 18:59:42 -0400
commitb582eb32b820e53dcd8ac9db58f6000b88cf2e4e (patch)
tree0cdb1c9e17163bd724eacb8523ca9f8af18542b1 /src/or/connection_edge.c
parent61b7e36312f5a097602ff110478072e0a13178c1 (diff)
downloadtor-b582eb32b820e53dcd8ac9db58f6000b88cf2e4e.tar.gz
tor-b582eb32b820e53dcd8ac9db58f6000b88cf2e4e.zip
Add a max_cells arg to connection_edge_process_raw_inbuf
I'm going to use this to implement more fairness in circuit_resume_edge_reading_helper in an attempt to fix bug 1298. (Updated with fixes from arma and Sebastian)
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index df182c6194..6a3a5ef0a9 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -147,7 +147,7 @@ connection_edge_process_inbuf(edge_connection_t *conn, int package_partial)
return 0;
case AP_CONN_STATE_OPEN:
case EXIT_CONN_STATE_OPEN:
- if (connection_edge_package_raw_inbuf(conn, package_partial) < 0) {
+ if (connection_edge_package_raw_inbuf(conn, package_partial, NULL) < 0) {
/* (We already sent an end cell if possible) */
connection_mark_for_close(TO_CONN(conn));
return -1;