nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bitwise check BRIDGE_DIRINFO

Browse Source 
Bitwise check for the BRIDGE_DIRINFO flag, rather than checking for
equality.

Fixes a (potential) bug where directories offering BRIDGE_DIRINFO,
and some other flag (i.e. microdescriptors or extrainfo),
would be ignored when looking for bridge directories.

Final fix in series for bug 13163.
This commit is contained in:
teor 2014-10-01 19:04:04 +10:00
parent ff42222845
commit 31bf8f2690
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug13163-bitwise-check-BRIDGE-DIRINFO Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Bitwise check the BRIDGE_DIRINFO flag rather than using equality.
Fixes a (potential) bug where directories offering BRIDGE_DIRINFO and
some other flag (i.e. microdescriptors or extrainfo) would be ignored
when looking for bridge directories. Partially fixes bug 13163.

6
src/or/directory.c
View File

@ -452,7 +452,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
return;
if (!get_via_tor) {
if (options->UseBridges && type != BRIDGE_DIRINFO) {
if (options->UseBridges && !(type & BRIDGE_DIRINFO)) {
/* We want to ask a running bridge for which we have a descriptor.
*
* When we ask choose_random_entry() for a bridge, we specify what
@ -479,7 +479,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
"nodes are available yet.");
return;
} else {
if (prefer_authority || type == BRIDGE_DIRINFO) {
if (prefer_authority || (type & BRIDGE_DIRINFO)) {
/* only ask authdirservers, and don't ask myself */
rs = router_pick_trusteddirserver(type, pds_flags);
if (rs == NULL && (pds_flags & (PDS_NO_EXISTING_SERVERDESC_FETCH|
@ -506,7 +506,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
return;
}
}
if (!rs && type != BRIDGE_DIRINFO) {
if (!rs && !(type & BRIDGE_DIRINFO)) {
/* */
rs = directory_pick_generic_dirserver(type, pds_flags,
dir_purpose);