aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.h
diff options
context:
space:
mode:
authornils <nils@shkoo.com>2012-02-29 17:04:45 -0800
committerLinus Nordberg <linus@torproject.org>2012-10-17 10:54:52 +0200
commitabb886014e1ee35909e8876fe3361cbfd26cc27c (patch)
tree8409f09ea0bf8a00c7f31aacd166c39dca6042b0 /src/or/geoip.h
parent167363403b54accb2442fe10a8c588532ab4c26f (diff)
downloadtor-abb886014e1ee35909e8876fe3361cbfd26cc27c.tar
tor-abb886014e1ee35909e8876fe3361cbfd26cc27c.tar.gz
Add GeoIP database for IPv6 addresses
Diffstat (limited to 'src/or/geoip.h')
-rw-r--r--src/or/geoip.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/geoip.h b/src/or/geoip.h
index e468c270e..145a42147 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -14,10 +14,12 @@
#ifdef GEOIP_PRIVATE
int geoip_ipv4_parse_entry(const char *line);
+int geoip_ipv6_parse_entry(const char *line);
+int geoip_get_country_by_ipv4(uint32_t ipaddr);
+int geoip_get_country_by_ipv6(const struct in6_addr *addr);
#endif
int should_record_bridge_info(const or_options_t *options);
-int geoip_load_file(const char *filename, const or_options_t *options);
-int geoip_get_country_by_ipv4(uint32_t ipaddr);
+int geoip_load_file(sa_family_t family, const char *filename, const or_options_t *options);
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);