summaryrefslogtreecommitdiff
path: root/src/or/geoip.c
diff options
context:
space:
mode:
authorNeel Chauhan <neel@neelc.org>2018-04-05 08:35:21 -0400
committerDavid Goulet <dgoulet@torproject.org>2018-04-05 08:37:39 -0400
commitf5f9c2554601e51157d8b563f124cea3fd3d98d4 (patch)
treee9661e2d8f24fde9e44e6edc368e4a6d7017b614 /src/or/geoip.c
parent98157c72cd9ddcfd92cd5cd2749d19d1677efd14 (diff)
downloadtor-f5f9c2554601e51157d8b563f124cea3fd3d98d4.tar.gz
tor-f5f9c2554601e51157d8b563f124cea3fd3d98d4.zip
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>
Diffstat (limited to 'src/or/geoip.c')
-rw-r--r--src/or/geoip.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 572bba577f..2c917c564d 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -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;
}
}