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

Bugfix: When a dns request failed, we would detach any "resolving" streams from the circuit before we would send a the resolve_failed cells.

Browse Source 
svn:r2355
This commit is contained in:
Nick Mathewson 2004-09-21 16:42:07 +00:00
parent 93f085c4a2
commit 0dcc8c7048
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/dns.c
View File

@ -494,11 +494,16 @@ static void dns_found_answer(char *address, uint32_t addr, char outcome) {
if(resolve->state == CACHE_STATE_FAILED) { if(resolve->state == CACHE_STATE_FAILED) {
/* prevent double-remove. */ /* prevent double-remove. */
pendconn->state = EXIT_CONN_STATE_RESOLVEFAILED; pendconn->state = EXIT_CONN_STATE_RESOLVEFAILED;
circuit_detach_stream(circuit_get_by_conn(pendconn), pendconn); if (pendconn->purpose == EXIT_PURPOSE_CONNECT) {
if (pendconn->purpose == EXIT_PURPOSE_CONNECT) /*XXXX can we safely raise the detach here to happen after we
* send the end cell? */
circuit_detach_stream(circuit_get_by_conn(pendconn), pendconn);
connection_edge_end(pendconn, END_STREAM_REASON_MISC, pendconn->cpath_layer); connection_edge_end(pendconn, END_STREAM_REASON_MISC, pendconn->cpath_layer);
else } else {
send_resolved_cell(pendconn, RESOLVED_TYPE_ERROR); send_resolved_cell(pendconn, RESOLVED_TYPE_ERROR);
/* This detach must happen after we send the resolved cell. */
circuit_detach_stream(circuit_get_by_conn(pendconn), pendconn);
}
connection_free(pendconn); connection_free(pendconn);
} else { } else {
if (pendconn->purpose == EXIT_PURPOSE_CONNECT) { if (pendconn->purpose == EXIT_PURPOSE_CONNECT) {