mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 06:35:28 +01:00
Code Issues Projects Releases Wiki Activity

When we choose to abandon a new entry guard because we think our

Browse source 
older ones might be better, close any circuits pending on that
new entry guard connection. Bugfix on 0.1.2.8-beta; found by lodger.


svn:r14417
This commit is contained in:
Roger Dingledine 2008-04-22 18:38:25 +00:00
parent bc95a4dbcb
commit d72b256f4f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -37,6 +37,9 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
Patch from mwenge. Fixes bug 646. Patch from mwenge. Fixes bug 646.
- Correctly notify one-hop connections when a circuit build has - Correctly notify one-hop connections when a circuit build has
failed. Possible fix for bug 669. Found by lodger. failed. Possible fix for bug 669. Found by lodger.
- When we choose to abandon a new entry guard because we think our
older ones might be better, close any circuits pending on that
new entry guard connection. Bugfix on 0.1.2.8-beta; 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
@ -46,7 +49,6 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
- Add a malloc_good_size implementation to OpenBSD_malloc_linux.c, - Add a malloc_good_size implementation to OpenBSD_malloc_linux.c,
to avoid unused RAM in buffer chunks and memory pools. to avoid unused RAM in buffer chunks and memory pools.
- Downgrade "sslv3 alert handshake failure" message to INFO. - Downgrade "sslv3 alert handshake failure" message to INFO.
- Only log guard node status when guard node status has changed.
- Add a couple of extra warnings to --enable-gcc-warnings for GCC 4.3, - Add a couple of extra warnings to --enable-gcc-warnings for GCC 4.3,
and stop using a warning that had become unfixably verbose under GCC and stop using a warning that had become unfixably verbose under GCC
4.3. 4.3.

7
src/or/connection_or.c
View file

@ -889,7 +889,12 @@ connection_or_set_state_open(or_connection_t *conn)
rep_hist_note_connect_succeeded(conn->identity_digest, now); rep_hist_note_connect_succeeded(conn->identity_digest, now);
if (entry_guard_register_connect_status(conn->identity_digest, if (entry_guard_register_connect_status(conn->identity_digest,
1, now) < 0) { 1, now) < 0) {
/* pending circs get closed in circuit_about_to_close_connection() */ /* Close any circuits pending on this conn. We leave it in state
* 'open' though, because it didn't actually *fail* -- we just
* chose not to use it. (Otherwise
* connection_about_to_close_connection() will call a big pile of
* functions to indicate we shouldn't try it again.) */
circuit_n_conn_done(conn, 0);
return -1; return -1;
} }
router_set_status(conn->identity_digest, 1); router_set_status(conn->identity_digest, 1);