aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendclient.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-11-27 12:54:57 -0500
committerNick Mathewson <nickm@torproject.org>2015-11-27 12:54:57 -0500
commit0a701e537778ac9da31049f4efebf7cb2bf9c285 (patch)
tree3f6bdd2a09a7bca70acaf9059c6f10ddb6c69d01 /src/or/rendclient.c
parenta33e9f208ae088fa3d63147fad9fc23654ca7ae1 (diff)
downloadtor-0a701e537778ac9da31049f4efebf7cb2bf9c285.tar.gz
tor-0a701e537778ac9da31049f4efebf7cb2bf9c285.zip
More fixes/debugging attempts for 17659
Diffstat (limited to 'src/or/rendclient.c')
-rw-r--r--src/or/rendclient.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 3e1c4f3613..d9cea53c04 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -173,6 +173,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP,
AP_CONN_STATE_CIRCUIT_WAIT,
introcirc->rend_data->onion_address))) {
+ connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn));
conn->state = AP_CONN_STATE_RENDDESC_WAIT;
}
}
@@ -1055,9 +1056,11 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro,
rend_client_refetch_v2_renddesc(rend_query);
/* move all pending streams back to renddesc_wait */
+ /* NOTE: We can now do this faster, if we use pending_entry_connections */
while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP,
AP_CONN_STATE_CIRCUIT_WAIT,
rend_query->onion_address))) {
+ connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn));
conn->state = AP_CONN_STATE_RENDDESC_WAIT;
}