aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-05 18:22:00 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-05 18:22:00 +0000
commit27126e5007a3cabb242c6f0d41981efc21945964 (patch)
tree318ddff8dcdcd92a112ce735e4c10f446b500a4c /src/or/connection_edge.c
parent92bb5b2860622795d24f9c2945868762a66e9a1e (diff)
downloadtor-27126e5007a3cabb242c6f0d41981efc21945964.tar.gz
tor-27126e5007a3cabb242c6f0d41981efc21945964.zip
oaep uses 42 more bytes -- stop clobbering buffers
also maybe fix some constants here and there -- nick? svn:r1484
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 61d60271fe..36b2341847 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -757,9 +757,6 @@ circuit_get_open_circ_or_launch(connection_t *conn,
return 1; /* we're happy */
}
- log_fn(LOG_INFO,"No safe circuit (purpose %d) ready for edge connection; delaying.",
- desired_circuit_purpose);
-
if(!*conn->rend_query) { /* general purpose circ */
addr = client_dns_lookup_entry(conn->socks_request->address);
if(router_exit_policy_all_routers_reject(addr, conn->socks_request->port)) {
@@ -804,6 +801,9 @@ circuit_get_open_circ_or_launch(connection_t *conn,
strcpy(circ->rend_query, conn->rend_query);
}
}
+ if(!circ)
+ log_fn(LOG_INFO,"No safe circuit (purpose %d) ready for edge connection; delaying.",
+ desired_circuit_purpose);
*circp = circ;
return 0;
}