aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.h
diff options
context:
space:
mode:
authorLinus Nordberg <linus@torproject.org>2012-10-20 18:48:58 +0200
committerLinus Nordberg <linus@torproject.org>2012-10-20 20:56:59 +0200
commit817ff962f830188ec4c1a907ebc389a856ea3288 (patch)
tree50954b5f4315db3b66d3ccb991fd818f0ee78935 /src/or/geoip.h
parente2313d8622aebc2704ce016dfef2be975fa535c3 (diff)
downloadtor-817ff962f830188ec4c1a907ebc389a856ea3288.tar
tor-817ff962f830188ec4c1a907ebc389a856ea3288.tar.gz
Separate IPv4 and IPv6 geoip file loading.
Also add IPv6 geoip file digest to extra info. Also also, add support for IPv6 addresses in control command "ip-to-country".
Diffstat (limited to 'src/or/geoip.h')
-rw-r--r--src/or/geoip.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/geoip.h b/src/or/geoip.h
index 38f128986..1d0012f85 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -24,8 +24,8 @@ int geoip_load_file(sa_family_t family, const char *filename,
int geoip_get_country_by_addr(const tor_addr_t *addr);
int geoip_get_n_countries(void);
const char *geoip_get_country_name(country_t num);
-int geoip_is_loaded(void);
-const char *geoip_db_digest(void);
+int geoip_is_loaded(sa_family_t family);
+const char *geoip_db_digest(sa_family_t family);
country_t geoip_get_country(const char *countrycode);
void geoip_note_client_seen(geoip_client_action_t action,