r15284@tombo: nickm | 2008-04-22 13:44:22 -0400

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


svn:r14416
This commit is contained in:
Nick Mathewson 2008-04-22 17:44:36 +00:00
parent a041553e21
commit 2e0bf9d8bf
2 changed files with 5 additions and 3 deletions

View File

@ -34,6 +34,8 @@ Changes in version 0.2.0.24-rc - 2008-04-0?
by adding "new stream" events for DNS requests, and removing
spurious "stream closed" events" for cached reverse resolves.
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 (security):
- Reject requests for reverse-dns lookup of names in a private

View File

@ -745,10 +745,10 @@ circuit_build_failed(origin_circuit_t *circ)
n_conn->_base.or_is_obsolete = 1;
entry_guard_register_connect_status(n_conn->identity_digest, 0,
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) {