summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-09-14 08:17:14 +0000
committerRoger Dingledine <arma@torproject.org>2003-09-14 08:17:14 +0000
commitebc23f690c38e70bfe1eb6aaa56a5c4eb9e35be4 (patch)
treeeb5b8c810fdabfbcb1be4d0576bbe31484e63b79 /src/or/main.c
parentb63013e8470a2d44036d8157344484c2f4d8c6cd (diff)
downloadtor-ebc23f690c38e70bfe1eb6aaa56a5c4eb9e35be4.tar.gz
tor-ebc23f690c38e70bfe1eb6aaa56a5c4eb9e35be4.zip
bugfix: onion pending queue now works
and fixed recent memory leak svn:r456
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 3fe57fcdb5..310ca3df69 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -256,7 +256,7 @@ static void conn_read(int i) {
* discussion of POLLIN vs POLLHUP */
conn = connection_array[i];
- //log_fn(LOG_DEBUG,"socket %d has something to read.",conn->s);
+ //log_fn(LOG_DEBUG,"socket %d wants to read.",conn->s);
if(
/* XXX does POLLHUP also mean it's definitely broken? */
@@ -300,7 +300,7 @@ static void check_conn_marked(int i) {
conn = connection_array[i];
assert(conn);
if(conn->marked_for_close) {
- log(LOG_DEBUG,"check_conn_marked(): Cleaning up connection.");
+ log_fn(LOG_DEBUG,"Cleaning up connection.");
if(conn->s >= 0) { /* might be an incomplete exit connection */
/* FIXME there's got to be a better way to check for this -- and make other checks? */
connection_flush_buf(conn); /* flush it first */