aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-12-18 21:27:08 +0000
committerNick Mathewson <nickm@torproject.org>2007-12-18 21:27:08 +0000
commit5488bc3e16d65972b538795d686a10a8e0e47f6e (patch)
treea20c5eaef4980eea1f5e5bdede5421140ec31e5d /src/or/or.h
parentb8ac050e85209a5ac56eed63954dda63874364b1 (diff)
downloadtor-5488bc3e16d65972b538795d686a10a8e0e47f6e.tar.gz
tor-5488bc3e16d65972b538795d686a10a8e0e47f6e.zip
r17231@catbus: nickm | 2007-12-18 16:21:55 -0500
Document and clean-up geoip code; give it some unit tests. svn:r12856
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h
index fd7e949087..7e3f95b435 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2317,7 +2317,7 @@ typedef struct {
/** DOCDOC here and in tor.1 */
int BridgeRecordUsageByCountry;
- char *GEOIPFile;
+ char *GeoIPFile;
} or_options_t;
@@ -3199,7 +3199,7 @@ void dnsserv_launch_request(const char *name, int is_reverse);
/********************************* geoip.c **************************/
#ifdef GEOIP_PRIVATE
-void geoip_add_entry(uint32_t low, uint32_t high, const char *country);
+int geoip_parse_entry(const char *line);
#endif
int geoip_load_file(const char *filename);
int geoip_get_country_by_ip(uint32_t ipaddr);