sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to use should_record_bridge_info() 

Both in geoip_note_client_seen() and options_need_geoip_info(), switch from
accessing the options directly to using the should_record_bridge_info() helper
function.

Fixes #25290

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
Neel Chauhan 2018-04-05 08:35:21 -04:00 committed by David Goulet
parent 98157c72cd
commit f5f9c25546
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket25290 Normal file
View File

@ -0,0 +1,5 @@
o Code simplification and refactoring:
- We switch to should_record_bridge_info() in geoip_note_client_seen() and
options_need_geoip_info() instead of accessing the configuration values
directly. Fixes bug 25290; bugfix on 0.2.1.6-alpha. Patch by Neel
Chauhan.

3
src/or/config.c
View File

@ -1682,8 +1682,7 @@ options_act_reversible(const or_options_t *old_options, char **msg)
int
options_need_geoip_info(const or_options_t *options, const char **reason_out)
{
int bridge_usage =
options->BridgeRelay && options->BridgeRecordUsageByCountry;
int bridge_usage = should_record_bridge_info(options);
int routerset_usage =
routerset_needs_geoip(options->EntryNodes) ||
routerset_needs_geoip(options->ExitNodes) ||

3
src/or/geoip.c
View File

@ -628,8 +628,7 @@ geoip_note_client_seen(geoip_client_action_t action,
/* Only remember statistics if the DoS mitigation subsystem is enabled. If
* not, only if as entry guard or as bridge. */
if (!dos_enabled()) {
if (!options->EntryStatistics &&
(!(options->BridgeRelay && options->BridgeRecordUsageByCountry))) {
if (!options->EntryStatistics && !should_record_bridge_info(options)) {
return;
}
}