aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-14 14:34:16 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-27 12:31:14 -0400
commitbd3612cd2b4c49fd9f9aec68b6268973e43f2b63 (patch)
treeec5e092ec63d687a326618e805066731abac637b /src/or/main.c
parentfc4ddafab81d5ca229436eeb0c460634e03cb2ca (diff)
downloadtor-bd3612cd2b4c49fd9f9aec68b6268973e43f2b63.tar
tor-bd3612cd2b4c49fd9f9aec68b6268973e43f2b63.tar.gz
Get SSL connections and linked connections working with bufferevents.
Clients are now verified to work and build circuits correctly. There are still a few warnings given here and there that I need to look into.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index cba98a884..263103662 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -722,9 +722,9 @@ conn_close_if_marked(int i)
/* We need to do this explicitly so that the linked connection
* notices that there was an EOF. */
bufferevent_flush(conn->bufev, EV_WRITE, BEV_FINISHED);
- /* XXXX Now can we free it? */
}
- return 0;
+ if (evbuffer_get_length(bufferevent_get_output(conn->bufev)))
+ return 0;
}
#endif