nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

If we're trying to fetch a bridge descriptor and there's no way

Browse Source 
the bridge authority could help us (for example, we don't know
a digest, or there is no bridge authority), don't be so eager to
fall back to asking the bridge authority.


svn:r12512
This commit is contained in:
Roger Dingledine 2007-11-16 07:31:51 +00:00
parent 116a0f0f22
commit 0871e02da8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -12,6 +12,10 @@ Changes in version 0.2.0.12-alpha - 2007-11-??
rebuild the descriptor. rebuild the descriptor.
- When picking v2 hidden service directories, don't pick ones that - When picking v2 hidden service directories, don't pick ones that
aren't listed as Running. aren't listed as Running.
- If we're trying to fetch a bridge descriptor and there's no way
the bridge authority could help us (for example, we don't know
a digest, or there is no bridge authority), don't be so eager to
fall back to asking the bridge authority.
o Minor features: o Minor features:
- When we negotiate a v2 OR connection (not yet implemented), accept - When we negotiate a v2 OR connection (not yet implemented), accept

14
src/or/circuitbuild.c
View File

@ -2945,6 +2945,7 @@ fetch_bridge_descriptors(time_t now)
or_options_t *options = get_options(); or_options_t *options = get_options();
int num_bridge_auths = get_n_authorities(BRIDGE_AUTHORITY); int num_bridge_auths = get_n_authorities(BRIDGE_AUTHORITY);
int ask_bridge_directly; int ask_bridge_directly;
int can_use_bridge_authority;
if (!bridge_list) if (!bridge_list)
return; return;
@ -2960,9 +2961,10 @@ fetch_bridge_descriptors(time_t now)
in.s_addr = htonl(bridge->addr); in.s_addr = htonl(bridge->addr);
tor_inet_ntoa(&in, address_buf, sizeof(address_buf)); tor_inet_ntoa(&in, address_buf, sizeof(address_buf));
ask_bridge_directly = tor_digest_is_zero(bridge->identity) || can_use_bridge_authority = !tor_digest_is_zero(bridge->identity) &&
!options->UpdateBridgesFromAuthority || num_bridge_auths;
!num_bridge_auths; ask_bridge_directly = !can_use_bridge_authority ||
!options->UpdateBridgesFromAuthority;
log_debug(LD_DIR, "ask_bridge_directly=%d (%d, %d, %d)", log_debug(LD_DIR, "ask_bridge_directly=%d (%d, %d, %d)",
ask_bridge_directly, tor_digest_is_zero(bridge->identity), ask_bridge_directly, tor_digest_is_zero(bridge->identity),
!options->UpdateBridgesFromAuthority, !num_bridge_auths); !options->UpdateBridgesFromAuthority, !num_bridge_auths);
@ -2971,9 +2973,9 @@ fetch_bridge_descriptors(time_t now)
!fascist_firewall_allows_address_or(bridge->addr, bridge->port)) { !fascist_firewall_allows_address_or(bridge->addr, bridge->port)) {
log_notice(LD_DIR, "Bridge at '%s:%d' isn't reachable by our " log_notice(LD_DIR, "Bridge at '%s:%d' isn't reachable by our "
"firewall policy. %s.", address_buf, bridge->port, "firewall policy. %s.", address_buf, bridge->port,
num_bridge_auths ? "Asking bridge authority instead" : can_use_bridge_authority ?
"Skipping"); "Asking bridge authority instead" : "Skipping");
if (num_bridge_auths) if (can_use_bridge_authorit)
ask_bridge_directly = 0; ask_bridge_directly = 0;
else else
continue; continue;