summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-05-12 19:49:48 +0000
committerRoger Dingledine <arma@torproject.org>2004-05-12 19:49:48 +0000
commit7ee6194f3adf4b818509734a2e8fb256ab86f68b (patch)
treed6580156e13a889d1ba83820c759e88074999990 /src/or/connection.c
parent9c3fba5c3bd654d42f8f539e7e8d3caa17861ea0 (diff)
downloadtor-7ee6194f3adf4b818509734a2e8fb256ab86f68b.tar.gz
tor-7ee6194f3adf4b818509734a2e8fb256ab86f68b.zip
break part of circuit.c into relay.c
svn:r1854
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index b95a408505..a50215d471 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -852,11 +852,12 @@ int connection_handle_write(connection_t *conn) {
}
}
- if(!connection_wants_to_flush(conn)) /* it's done flushing */
- if(connection_finished_flushing(conn) < 0) { /* ...and get handled here. */
+ if(!connection_wants_to_flush(conn)) { /* it's done flushing */
+ if(connection_finished_flushing(conn) < 0) {
/* already marked */
return -1;
}
+ }
return 0;
}
@@ -1053,6 +1054,7 @@ int connection_state_is_open(connection_t *conn) {
return 0;
}
+/** Return 1 if conn is in 'connecting' state, else return 0. */
int connection_state_is_connecting(connection_t *conn) {
tor_assert(conn);