diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-12-17 14:59:19 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-12-17 14:59:19 +0000 |
commit | 26632d59dd34aef4834ee9844adeab5131248bf7 (patch) | |
tree | 694c0654f8ae8194c1f2b5ce490990aa5f101821 /src/or/connection_or.c | |
parent | 514f99034fffcbfe6cd37d2b982c6c637e62f37e (diff) | |
download | tor-26632d59dd34aef4834ee9844adeab5131248bf7.tar.gz tor-26632d59dd34aef4834ee9844adeab5131248bf7.zip |
Rename or_is_obsolete and move it to or_connection_t where it belongs.
svn:r17642
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 028f3ded79..2cd96688f2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -474,14 +474,14 @@ connection_or_get_by_identity_digest(const char *digest) if (best->is_canonical && !conn->is_canonical) continue; /* A canonical connection is best. */ - if (!best->_base.or_is_obsolete && conn->_base.or_is_obsolete) + if (!best->is_bad_for_new_circs && conn->is_bad_for_new_circs) continue; /* We never prefer obsolete over non-obsolete connections. */ if ( /* We prefer canonical connections: */ (!best->is_canonical && conn->is_canonical) || /* We prefer non-obsolete connections: */ - (best->_base.or_is_obsolete && !conn->_base.or_is_obsolete) || + (best->is_bad_for_new_circs && !conn->is_bad_for_new_circs) || /* If both have circuits we prefer the newer: */ (best->n_circuits && conn->n_circuits && newer) || /* If neither has circuits we prefer the newer: */ |