aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-09-17 03:23:26 -0700
committerRobert Ransom <rransom.8774@gmail.com>2011-10-02 12:49:35 -0700
commit34a6b8b7e588b6f10e6e87cf876ef6ada49f8b8a (patch)
tree200537b33bfeb739bc15e34f565405ae7bfc1655 /src/or/circuituse.c
parenteaed37d14c6e1dc93a392f62ef2e501f75e4878a (diff)
downloadtor-34a6b8b7e588b6f10e6e87cf876ef6ada49f8b8a.tar.gz
tor-34a6b8b7e588b6f10e6e87cf876ef6ada49f8b8a.zip
Clear the timed_out flag when an HS connection attempt ends
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 0ad8b3b51b..f2fd6fe3b4 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1464,6 +1464,13 @@ link_apconn_to_circ(edge_connection_t *apconn, origin_circuit_t *circ,
/* assert_connection_ok(conn, time(NULL)); */
circ->p_streams = apconn;
+ if (connection_edge_is_rendezvous_stream(apconn)) {
+ /* We are attaching a stream to a rendezvous circuit. That means
+ * that an attempt to connect to a hidden service just
+ * succeeded. Tell rendclient.c. */
+ rend_client_note_connection_attempt_ended(apconn->rend_data->onion_address);
+ }
+
if (cpath) { /* we were given one; use it */
tor_assert(cpath_is_on_circuit(circ, cpath));
apconn->cpath_layer = cpath;