nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't detach-and-retry rendezvous streams

Browse Source 
svn:r1498
This commit is contained in:
Roger Dingledine 2004-04-05 22:43:01 +00:00
parent 0f74b68edd
commit 077f133257
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/connection_edge.c
View File

@ -595,6 +595,15 @@ void connection_ap_expire_beginning(void) {
continue; continue;
conn->num_retries++; conn->num_retries++;
circ = circuit_get_by_conn(conn); circ = circuit_get_by_conn(conn);
if(circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
if (now - conn->timestamp_lastread > 45) {
log_fn(LOG_WARN,"Rend stream is %d seconds late. Giving up.",
(int)(now - conn->timestamp_lastread));
connection_mark_for_close(conn,END_STREAM_REASON_TIMEOUT);
}
continue;
}
assert(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL);
if(conn->num_retries >= MAX_STREAM_RETRIES) { if(conn->num_retries >= MAX_STREAM_RETRIES) {
log_fn(LOG_WARN,"Stream is %d seconds late. Giving up.", log_fn(LOG_WARN,"Stream is %d seconds late. Giving up.",
15*conn->num_retries); 15*conn->num_retries);