diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-09-21 06:14:36 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-09-21 06:14:36 +0000 |
| commit | 193a144c9fc069f230a4e1cd14815b0514731253 (patch) | |
| tree | 47abaa6cf3c80d3276dd8e89a742d83df55bf93f /src/or/circuitbuild.c | |
| parent | 6aadc6071e1eace36920fee7ae79dd53c2cc6811 (diff) | |
| download | tor-193a144c9fc069f230a4e1cd14815b0514731253.tar.gz tor-193a144c9fc069f230a4e1cd14815b0514731253.zip | |
Make "UpdateBridgesFromAuthority" torrc option work: when bridge
users configure that and specify a bridge with an identity
fingerprint, now they will lookup the bridge descriptor at the
default bridge authority via a one-hop tunnel, but once circuits
are established they will switch to a three-hop tunnel for later
connections to the bridge authority.
svn:r11550
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2f88c85e88..32077a4525 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2927,6 +2927,9 @@ fetch_bridge_descriptors(time_t now) ask_bridge_directly = tor_digest_is_zero(bridge->identity) || !options->UpdateBridgesFromAuthority || !num_bridge_auths; + log_debug(LD_DIR, "ask_bridge_directly=%d (%d, %d, %d)", + ask_bridge_directly, tor_digest_is_zero(bridge->identity), + !options->UpdateBridgesFromAuthority, !num_bridge_auths); if (ask_bridge_directly && !fascist_firewall_allows_address_or(bridge->addr, bridge->port)) { @@ -2961,7 +2964,7 @@ fetch_bridge_descriptors(time_t now) log_info(LD_DIR, "Fetching bridge info '%s' from bridge authority.", resource); directory_get_from_dirserver(DIR_PURPOSE_FETCH_SERVERDESC, - ROUTER_PURPOSE_BRIDGE, resource, 1); + ROUTER_PURPOSE_BRIDGE, resource, 0); } }); } |