aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.h
diff options
context:
space:
mode:
authornils <nils@shkoo.com>2012-02-29 16:42:59 -0800
committerLinus Nordberg <linus@torproject.org>2012-10-17 10:54:17 +0200
commit167363403b54accb2442fe10a8c588532ab4c26f (patch)
tree701b88e55cacb8b2e75fcbf6b66d5d46a1d7a6ee /src/or/geoip.h
parent4da2864308efd3de7a3dcc857003fa4aea169be6 (diff)
downloadtor-167363403b54accb2442fe10a8c588532ab4c26f.tar
tor-167363403b54accb2442fe10a8c588532ab4c26f.tar.gz
Rename address family specific IPv4 geoip functions in preparation for IPv6 support
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 4aed4e07b..e468c270e 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -13,11 +13,11 @@
#define _TOR_GEOIP_H
#ifdef GEOIP_PRIVATE
-int geoip_parse_entry(const char *line);
+int geoip_ipv4_parse_entry(const char *line);
#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_ip(uint32_t ipaddr);
+int geoip_get_country_by_ipv4(uint32_t ipaddr);
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);