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

r15283@tombo: nickm | 2008-04-22 13:43:45 -0400

Browse Source 
Correctly notify one-hop connections when a circuit build has failed. possible fix for bug 669. found by lodger.


svn:r14415
This commit is contained in:
Nick Mathewson 2008-04-22 17:44:28 +00:00
parent 21592ad429
commit bc95a4dbcb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -35,6 +35,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
by adding "new stream" events for DNS requests, and removing by adding "new stream" events for DNS requests, and removing
spurious "stream closed" events" for cached reverse resolves. spurious "stream closed" events" for cached reverse resolves.
Patch from mwenge. Fixes bug 646. Patch from mwenge. Fixes bug 646.
- Correctly notify one-hop connections when a circuit build has
failed. Possible fix for bug 669. Found by lodger.
o Minor features: o Minor features:
- Allow separate log levels to be configured for different logging - Allow separate log levels to be configured for different logging

6
src/or/circuituse.c
View File

@ -745,10 +745,10 @@ circuit_build_failed(origin_circuit_t *circ)
n_conn->_base.or_is_obsolete = 1; n_conn->_base.or_is_obsolete = 1;
entry_guard_register_connect_status(n_conn->identity_digest, 0, entry_guard_register_connect_status(n_conn->identity_digest, 0,
time(NULL)); time(NULL));
/* if there are any one-hop streams waiting on this circuit, fail
* them now so they can retry elsewhere. */
connection_ap_fail_onehop(n_conn->identity_digest);
} }
/* if there are any one-hop streams waiting on this circuit, fail
* them now so they can retry elsewhere. */
connection_ap_fail_onehop(circ->_base.n_conn_id_digest);
} }
switch (circ->_base.purpose) { switch (circ->_base.purpose) {