summaryrefslogtreecommitdiff
path: root/src/or/routerset.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/routerset.c')
-rw-r--r--src/or/routerset.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerset.c b/src/or/routerset.c
index 263cf79d70..8a5ff218b2 100644
--- a/src/or/routerset.c
+++ b/src/or/routerset.c
@@ -74,7 +74,7 @@ routerset_get_countryname(const char *c)
}
/** Update the routerset's <b>countries</b> bitarray_t. Called whenever
- * the GeoIP database is reloaded.
+ * the GeoIP IPv4 database is reloaded.
*/
void
routerset_refresh_countries(routerset_t *target)
@@ -82,7 +82,7 @@ routerset_refresh_countries(routerset_t *target)
int cc;
bitarray_free(target->countries);
- if (!geoip_is_loaded()) {
+ if (!geoip_is_loaded(AF_INET)) {
target->countries = NULL;
target->n_countries = 0;
return;
@@ -216,7 +216,7 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr,
return 3;
if (set->countries) {
if (country < 0 && addr)
- country = geoip_get_country_by_ip(tor_addr_to_ipv4h(addr));
+ country = geoip_get_country_by_addr(addr);
if (country >= 0 && country < set->n_countries &&
bitarray_is_set(set->countries, country))