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

don't crash, if a conn that sent a begin has suddenly lost its circuit

Browse Source 
svn:r1704
This commit is contained in:
Roger Dingledine 2004-04-25 22:48:47 +00:00
parent f9418c05bb
commit 9e5d2ad91c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/connection_edge.c
View File

@ -620,6 +620,11 @@ 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) { /* it's vanished? */
log_fn(LOG_INFO,"Conn is in connect-wait, but lost its circ.");
connection_mark_for_close(conn,0);
continue;
}
if(circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { if(circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
if (now - conn->timestamp_lastread > 45) { if (now - conn->timestamp_lastread > 45) {
log_fn(LOG_WARN,"Rend stream is %d seconds late. Giving up.", log_fn(LOG_WARN,"Rend stream is %d seconds late. Giving up.",