2009-05-02 22:00:54 +02:00
|
|
|
/* Copyright (c) 2007-2009, The Tor Project, Inc. */
|
2007-12-17 23:44:11 +01:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/**
|
|
|
|
* \file geoip.c
|
|
|
|
* \brief Functions related to maintaining an IP-to-country database and to
|
|
|
|
* summarizing client connections by country.
|
|
|
|
*/
|
|
|
|
|
2007-12-17 23:44:11 +01:00
|
|
|
#define GEOIP_PRIVATE
|
|
|
|
#include "or.h"
|
|
|
|
#include "ht.h"
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
static void clear_geoip_db(void);
|
2009-05-27 17:52:46 +02:00
|
|
|
static void dump_geoip_stats(void);
|
2009-07-05 20:48:16 +02:00
|
|
|
static void dump_entry_stats(void);
|
2007-12-17 23:44:11 +01:00
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** An entry from the GeoIP file: maps an IP range to a country. */
|
2007-12-17 23:44:11 +01:00
|
|
|
typedef struct geoip_entry_t {
|
2007-12-18 22:27:08 +01:00
|
|
|
uint32_t ip_low; /**< The lowest IP in the range, in host order */
|
|
|
|
uint32_t ip_high; /**< The highest IP in the range, in host order */
|
2008-02-22 20:09:45 +01:00
|
|
|
intptr_t country; /**< An index into geoip_countries */
|
2007-12-17 23:44:11 +01:00
|
|
|
} geoip_entry_t;
|
|
|
|
|
2008-12-17 23:58:20 +01:00
|
|
|
/** For how many periods should we remember per-country request history? */
|
2009-05-27 17:52:46 +02:00
|
|
|
#define REQUEST_HIST_LEN 1
|
2008-12-17 23:58:20 +01:00
|
|
|
/** How long are the periods for which we should remember request history? */
|
2009-05-27 17:52:46 +02:00
|
|
|
#define REQUEST_HIST_PERIOD (24*60*60)
|
2008-06-10 20:08:56 +02:00
|
|
|
|
2008-12-25 16:37:47 +01:00
|
|
|
/** A per-country record for GeoIP request history. */
|
2008-06-10 20:08:56 +02:00
|
|
|
typedef struct geoip_country_t {
|
|
|
|
char countrycode[3];
|
|
|
|
uint32_t n_v2_ns_requests[REQUEST_HIST_LEN];
|
|
|
|
uint32_t n_v3_ns_requests[REQUEST_HIST_LEN];
|
|
|
|
} geoip_country_t;
|
|
|
|
|
|
|
|
/** A list of geoip_country_t */
|
2007-12-17 23:44:11 +01:00
|
|
|
static smartlist_t *geoip_countries = NULL;
|
2007-12-18 22:27:08 +01:00
|
|
|
/** A map from lowercased country codes to their position in geoip_countries.
|
|
|
|
* The index is encoded in the pointer, and 1 is added so that NULL can mean
|
|
|
|
* not found. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static strmap_t *country_idxplus1_by_lc_code = NULL;
|
2007-12-18 22:27:08 +01:00
|
|
|
/** A list of all known geoip_entry_t, sorted by ip_low. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static smartlist_t *geoip_entries = NULL;
|
|
|
|
|
2008-09-25 22:21:35 +02:00
|
|
|
/** Return the index of the <b>country</b>'s entry in the GeoIP DB
|
2009-05-26 21:32:56 +02:00
|
|
|
* if it is a valid 2-letter country code, otherwise return -1.
|
2008-09-25 22:21:35 +02:00
|
|
|
*/
|
|
|
|
country_t
|
|
|
|
geoip_get_country(const char *country)
|
|
|
|
{
|
|
|
|
void *_idxplus1;
|
|
|
|
intptr_t idx;
|
|
|
|
|
|
|
|
_idxplus1 = strmap_get_lc(country_idxplus1_by_lc_code, country);
|
|
|
|
if (!_idxplus1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
idx = ((uintptr_t)_idxplus1)-1;
|
|
|
|
return (country_t)idx;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Add an entry to the GeoIP table, mapping all IPs between <b>low</b> and
|
|
|
|
* <b>high</b>, inclusive, to the 2-letter country code <b>country</b>.
|
|
|
|
*/
|
|
|
|
static void
|
2007-12-17 23:44:11 +01:00
|
|
|
geoip_add_entry(uint32_t low, uint32_t high, const char *country)
|
|
|
|
{
|
2008-02-22 20:09:45 +01:00
|
|
|
intptr_t idx;
|
2007-12-17 23:44:11 +01:00
|
|
|
geoip_entry_t *ent;
|
2007-12-18 22:27:08 +01:00
|
|
|
void *_idxplus1;
|
|
|
|
|
|
|
|
if (high < low)
|
|
|
|
return;
|
|
|
|
|
|
|
|
_idxplus1 = strmap_get_lc(country_idxplus1_by_lc_code, country);
|
2007-12-17 23:44:11 +01:00
|
|
|
|
|
|
|
if (!_idxplus1) {
|
2008-06-10 20:08:56 +02:00
|
|
|
geoip_country_t *c = tor_malloc_zero(sizeof(geoip_country_t));
|
|
|
|
strlcpy(c->countrycode, country, sizeof(c->countrycode));
|
|
|
|
tor_strlower(c->countrycode);
|
2007-12-17 23:44:11 +01:00
|
|
|
smartlist_add(geoip_countries, c);
|
2007-12-17 23:44:18 +01:00
|
|
|
idx = smartlist_len(geoip_countries) - 1;
|
2007-12-17 23:44:11 +01:00
|
|
|
strmap_set_lc(country_idxplus1_by_lc_code, country, (void*)(idx+1));
|
|
|
|
} else {
|
|
|
|
idx = ((uintptr_t)_idxplus1)-1;
|
|
|
|
}
|
2008-06-10 20:08:56 +02:00
|
|
|
{
|
|
|
|
geoip_country_t *c = smartlist_get(geoip_countries, idx);
|
|
|
|
tor_assert(!strcasecmp(c->countrycode, country));
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
ent = tor_malloc_zero(sizeof(geoip_entry_t));
|
|
|
|
ent->ip_low = low;
|
|
|
|
ent->ip_high = high;
|
|
|
|
ent->country = idx;
|
|
|
|
smartlist_add(geoip_entries, ent);
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Add an entry to the GeoIP table, parsing it from <b>line</b>. The
|
2008-04-16 02:12:44 +02:00
|
|
|
* format is as for geoip_load_file(). */
|
2007-12-18 22:27:08 +01:00
|
|
|
/*private*/ int
|
|
|
|
geoip_parse_entry(const char *line)
|
|
|
|
{
|
|
|
|
unsigned int low, high;
|
|
|
|
char b[3];
|
|
|
|
if (!geoip_countries) {
|
|
|
|
geoip_countries = smartlist_create();
|
|
|
|
geoip_entries = smartlist_create();
|
|
|
|
country_idxplus1_by_lc_code = strmap_new();
|
|
|
|
}
|
2008-05-28 20:31:57 +02:00
|
|
|
while (TOR_ISSPACE(*line))
|
|
|
|
++line;
|
|
|
|
if (*line == '#')
|
|
|
|
return 0;
|
2007-12-18 22:27:08 +01:00
|
|
|
if (sscanf(line,"%u,%u,%2s", &low, &high, b) == 3) {
|
|
|
|
geoip_add_entry(low, high, b);
|
|
|
|
return 0;
|
|
|
|
} else if (sscanf(line,"\"%u\",\"%u\",\"%2s\",", &low, &high, b) == 3) {
|
|
|
|
geoip_add_entry(low, high, b);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
log_warn(LD_GENERAL, "Unable to parse line from GEOIP file: %s",
|
|
|
|
escaped(line));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Sorting helper: return -1, 1, or 0 based on comparison of two
|
|
|
|
* geoip_entry_t */
|
2007-12-17 23:44:11 +01:00
|
|
|
static int
|
|
|
|
_geoip_compare_entries(const void **_a, const void **_b)
|
|
|
|
{
|
|
|
|
const geoip_entry_t *a = *_a, *b = *_b;
|
|
|
|
if (a->ip_low < b->ip_low)
|
|
|
|
return -1;
|
|
|
|
else if (a->ip_low > b->ip_low)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** bsearch helper: return -1, 1, or 0 based on comparison of an IP (a pointer
|
|
|
|
* to a uint32_t in host order) to a geoip_entry_t */
|
2007-12-17 23:44:11 +01:00
|
|
|
static int
|
|
|
|
_geoip_compare_key_to_entry(const void *_key, const void **_member)
|
|
|
|
{
|
|
|
|
const uint32_t addr = *(uint32_t *)_key;
|
|
|
|
const geoip_entry_t *entry = *_member;
|
|
|
|
if (addr < entry->ip_low)
|
|
|
|
return -1;
|
|
|
|
else if (addr > entry->ip_high)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-06-04 11:02:25 +02:00
|
|
|
/** Return 1 if we should collect geoip stats on bridge users, and
|
|
|
|
* include them in our extrainfo descriptor. Else return 0. */
|
|
|
|
int
|
|
|
|
should_record_bridge_info(or_options_t *options)
|
|
|
|
{
|
|
|
|
return options->BridgeRelay && options->BridgeRecordUsageByCountry;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Clear the GeoIP database and reload it from the file
|
|
|
|
* <b>filename</b>. Return 0 on success, -1 on failure.
|
|
|
|
*
|
|
|
|
* Recognized line formats are:
|
|
|
|
* INTIPLOW,INTIPHIGH,CC
|
|
|
|
* and
|
|
|
|
* "INTIPLOW","INTIPHIGH","CC","CC3","COUNTRY NAME"
|
|
|
|
* where INTIPLOW and INTIPHIGH are IPv4 addresses encoded as 4-byte unsigned
|
|
|
|
* integers, and CC is a country code.
|
2008-05-29 04:29:35 +02:00
|
|
|
*
|
2008-05-28 23:10:46 +02:00
|
|
|
* It also recognizes, and skips over, blank lines and lines that start
|
|
|
|
* with '#' (comments).
|
2007-12-18 22:27:08 +01:00
|
|
|
*/
|
2007-12-17 23:44:11 +01:00
|
|
|
int
|
2008-06-04 11:02:25 +02:00
|
|
|
geoip_load_file(const char *filename, or_options_t *options)
|
2007-12-17 23:44:11 +01:00
|
|
|
{
|
|
|
|
FILE *f;
|
2008-09-25 23:06:32 +02:00
|
|
|
const char *msg = "";
|
|
|
|
int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;
|
2007-12-18 22:27:08 +01:00
|
|
|
clear_geoip_db();
|
2007-12-17 23:44:11 +01:00
|
|
|
if (!(f = fopen(filename, "r"))) {
|
2008-09-25 23:06:32 +02:00
|
|
|
log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. %s",
|
|
|
|
filename, msg);
|
2007-12-17 23:44:11 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2008-09-25 22:21:35 +02:00
|
|
|
if (!geoip_countries) {
|
|
|
|
geoip_countries = smartlist_create();
|
|
|
|
country_idxplus1_by_lc_code = strmap_new();
|
|
|
|
}
|
|
|
|
if (geoip_entries) {
|
|
|
|
SMARTLIST_FOREACH(geoip_entries, geoip_entry_t *, e, tor_free(e));
|
|
|
|
smartlist_free(geoip_entries);
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
geoip_entries = smartlist_create();
|
2008-09-25 23:06:32 +02:00
|
|
|
log_notice(LD_GENERAL, "Parsing GEOIP file.");
|
2007-12-17 23:44:11 +01:00
|
|
|
while (!feof(f)) {
|
2007-12-17 23:44:16 +01:00
|
|
|
char buf[512];
|
2008-02-22 20:09:45 +01:00
|
|
|
if (fgets(buf, (int)sizeof(buf), f) == NULL)
|
2007-12-17 23:44:16 +01:00
|
|
|
break;
|
2008-02-05 22:39:44 +01:00
|
|
|
/* FFFF track full country name. */
|
2007-12-18 22:27:08 +01:00
|
|
|
geoip_parse_entry(buf);
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
2008-12-18 17:11:03 +01:00
|
|
|
/*XXXX abort and return -1 if no entries/illformed?*/
|
2007-12-17 23:44:11 +01:00
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
smartlist_sort(geoip_entries, _geoip_compare_entries);
|
2009-02-16 16:15:06 +01:00
|
|
|
|
|
|
|
/* Okay, now we need to maybe change our mind about what is in which
|
|
|
|
* country. */
|
|
|
|
refresh_all_country_info();
|
|
|
|
|
2007-12-17 23:44:11 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Given an IP address in host order, return a number representing the
|
|
|
|
* country to which that address belongs, or -1 for unknown. The return value
|
|
|
|
* will always be less than geoip_get_n_countries(). To decode it,
|
|
|
|
* call geoip_get_country_name().
|
|
|
|
*/
|
2007-12-17 23:44:11 +01:00
|
|
|
int
|
|
|
|
geoip_get_country_by_ip(uint32_t ipaddr)
|
|
|
|
{
|
|
|
|
geoip_entry_t *ent;
|
|
|
|
if (!geoip_entries)
|
|
|
|
return -1;
|
|
|
|
ent = smartlist_bsearch(geoip_entries, &ipaddr, _geoip_compare_key_to_entry);
|
2008-02-22 20:09:45 +01:00
|
|
|
return ent ? (int)ent->country : -1;
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
|
2007-12-25 00:51:22 +01:00
|
|
|
/** Return the number of countries recognized by the GeoIP database. */
|
2007-12-17 23:44:11 +01:00
|
|
|
int
|
|
|
|
geoip_get_n_countries(void)
|
|
|
|
{
|
2008-02-22 20:09:45 +01:00
|
|
|
return (int) smartlist_len(geoip_countries);
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Return the two-letter country code associated with the number <b>num</b>,
|
|
|
|
* or "??" for an unknown value. */
|
2007-12-17 23:44:11 +01:00
|
|
|
const char *
|
2008-09-25 22:21:35 +02:00
|
|
|
geoip_get_country_name(country_t num)
|
2007-12-17 23:44:11 +01:00
|
|
|
{
|
2008-06-10 20:08:56 +02:00
|
|
|
if (geoip_countries && num >= 0 && num < smartlist_len(geoip_countries)) {
|
|
|
|
geoip_country_t *c = smartlist_get(geoip_countries, num);
|
|
|
|
return c->countrycode;
|
|
|
|
} else
|
2007-12-17 23:44:11 +01:00
|
|
|
return "??";
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Return true iff we have loaded a GeoIP database.*/
|
2007-12-17 23:44:11 +01:00
|
|
|
int
|
|
|
|
geoip_is_loaded(void)
|
|
|
|
{
|
|
|
|
return geoip_countries != NULL && geoip_entries != NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Entry in a map from IP address to the last time we've seen an incoming
|
|
|
|
* connection from that IP address. Used by bridges only, to track which
|
|
|
|
* countries have them blocked. */
|
2007-12-17 23:44:11 +01:00
|
|
|
typedef struct clientmap_entry_t {
|
|
|
|
HT_ENTRY(clientmap_entry_t) node;
|
|
|
|
uint32_t ipaddr;
|
2009-05-26 21:32:56 +02:00
|
|
|
unsigned int last_seen_in_minutes:30;
|
|
|
|
unsigned int action:2;
|
2007-12-17 23:44:11 +01:00
|
|
|
} clientmap_entry_t;
|
|
|
|
|
2008-05-29 04:29:35 +02:00
|
|
|
#define ACTION_MASK 3
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Map from client IP address to last time seen. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static HT_HEAD(clientmap, clientmap_entry_t) client_history =
|
|
|
|
HT_INITIALIZER();
|
2008-06-10 20:08:56 +02:00
|
|
|
/** Time at which we started tracking client IP history. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static time_t client_history_starts = 0;
|
|
|
|
|
2008-12-17 23:58:20 +01:00
|
|
|
/** When did the current period of checking per-country request history
|
|
|
|
* start? */
|
2008-06-10 20:08:56 +02:00
|
|
|
static time_t current_request_period_starts = 0;
|
2008-12-17 23:58:20 +01:00
|
|
|
/** How many older request periods are we remembering? */
|
2008-06-10 20:08:56 +02:00
|
|
|
static int n_old_request_periods = 0;
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Hashtable helper: compute a hash of a clientmap_entry_t. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static INLINE unsigned
|
|
|
|
clientmap_entry_hash(const clientmap_entry_t *a)
|
|
|
|
{
|
|
|
|
return ht_improve_hash((unsigned) a->ipaddr);
|
|
|
|
}
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Hashtable helper: compare two clientmap_entry_t values for equality. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static INLINE int
|
|
|
|
clientmap_entries_eq(const clientmap_entry_t *a, const clientmap_entry_t *b)
|
|
|
|
{
|
2009-05-26 21:32:56 +02:00
|
|
|
return a->ipaddr == b->ipaddr && a->action == b->action;
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
HT_PROTOTYPE(clientmap, clientmap_entry_t, node, clientmap_entry_hash,
|
|
|
|
clientmap_entries_eq);
|
|
|
|
HT_GENERATE(clientmap, clientmap_entry_t, node, clientmap_entry_hash,
|
|
|
|
clientmap_entries_eq, 0.6, malloc, realloc, free);
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Note that we've seen a client connect from the IP <b>addr</b> (host order)
|
2009-05-26 21:32:56 +02:00
|
|
|
* at time <b>now</b>. Ignored by all but bridges and directories if
|
|
|
|
* configured accordingly. */
|
2007-12-17 23:44:11 +01:00
|
|
|
void
|
2008-05-29 04:29:35 +02:00
|
|
|
geoip_note_client_seen(geoip_client_action_t action,
|
|
|
|
uint32_t addr, time_t now)
|
2007-12-17 23:44:11 +01:00
|
|
|
{
|
|
|
|
or_options_t *options = get_options();
|
|
|
|
clientmap_entry_t lookup, *ent;
|
2008-05-29 04:29:35 +02:00
|
|
|
if (action == GEOIP_CLIENT_CONNECT) {
|
2009-07-05 20:48:16 +02:00
|
|
|
#ifdef ENABLE_ENTRY_STATS
|
|
|
|
if (!options->EntryStatistics)
|
|
|
|
return;
|
|
|
|
#else
|
2008-05-29 04:29:35 +02:00
|
|
|
if (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))
|
|
|
|
return;
|
2009-07-05 20:48:16 +02:00
|
|
|
#endif
|
2009-05-26 21:41:42 +02:00
|
|
|
/* Did we recently switch from bridge to relay or back? */
|
|
|
|
if (client_history_starts > now)
|
|
|
|
return;
|
2008-05-29 04:29:35 +02:00
|
|
|
} else {
|
|
|
|
#ifndef ENABLE_GEOIP_STATS
|
2007-12-17 23:44:11 +01:00
|
|
|
return;
|
2008-05-29 04:29:35 +02:00
|
|
|
#else
|
2009-05-27 17:52:46 +02:00
|
|
|
if (options->BridgeRelay || options->BridgeAuthoritativeDir)
|
2008-05-29 04:29:35 +02:00
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-12-17 23:58:20 +01:00
|
|
|
/* Rotate the current request period. */
|
2008-06-10 21:11:02 +02:00
|
|
|
while (current_request_period_starts + REQUEST_HIST_PERIOD < now) {
|
2008-06-10 21:06:48 +02:00
|
|
|
if (!geoip_countries)
|
|
|
|
geoip_countries = smartlist_create();
|
2008-06-10 21:51:48 +02:00
|
|
|
if (!current_request_period_starts) {
|
|
|
|
current_request_period_starts = now;
|
|
|
|
break;
|
|
|
|
}
|
2009-05-27 17:52:46 +02:00
|
|
|
/* Also discard all items in the client history that are too old.
|
|
|
|
* (This only works here because bridge and directory stats are
|
|
|
|
* independent. Otherwise, we'd only want to discard those items
|
|
|
|
* with action GEOIP_CLIENT_NETWORKSTATUS{_V2}.) */
|
|
|
|
geoip_remove_old_clients(current_request_period_starts);
|
|
|
|
/* Before rotating, write the current stats to disk. */
|
|
|
|
dump_geoip_stats();
|
2009-07-05 20:48:16 +02:00
|
|
|
if (get_options()->EntryStatistics)
|
|
|
|
dump_entry_stats();
|
2009-05-27 17:52:46 +02:00
|
|
|
/* Now rotate request period */
|
2008-06-10 20:08:56 +02:00
|
|
|
SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, {
|
|
|
|
memmove(&c->n_v2_ns_requests[0], &c->n_v2_ns_requests[1],
|
|
|
|
sizeof(uint32_t)*(REQUEST_HIST_LEN-1));
|
|
|
|
memmove(&c->n_v3_ns_requests[0], &c->n_v3_ns_requests[1],
|
|
|
|
sizeof(uint32_t)*(REQUEST_HIST_LEN-1));
|
|
|
|
c->n_v2_ns_requests[REQUEST_HIST_LEN-1] = 0;
|
|
|
|
c->n_v3_ns_requests[REQUEST_HIST_LEN-1] = 0;
|
|
|
|
});
|
|
|
|
current_request_period_starts += REQUEST_HIST_PERIOD;
|
2008-06-10 21:51:48 +02:00
|
|
|
if (n_old_request_periods < REQUEST_HIST_LEN-1)
|
2008-06-10 20:08:56 +02:00
|
|
|
++n_old_request_periods;
|
2009-05-26 21:32:56 +02:00
|
|
|
}
|
2008-06-10 20:08:56 +02:00
|
|
|
|
2007-12-17 23:44:11 +01:00
|
|
|
lookup.ipaddr = addr;
|
2009-05-26 21:32:56 +02:00
|
|
|
lookup.action = (int)action;
|
2007-12-17 23:44:11 +01:00
|
|
|
ent = HT_FIND(clientmap, &client_history, &lookup);
|
|
|
|
if (ent) {
|
2009-05-26 21:32:56 +02:00
|
|
|
ent->last_seen_in_minutes = now / 60;
|
2007-12-17 23:44:11 +01:00
|
|
|
} else {
|
|
|
|
ent = tor_malloc_zero(sizeof(clientmap_entry_t));
|
|
|
|
ent->ipaddr = addr;
|
2009-05-26 21:32:56 +02:00
|
|
|
ent->last_seen_in_minutes = now / 60;
|
|
|
|
ent->action = (int)action;
|
2007-12-17 23:44:11 +01:00
|
|
|
HT_INSERT(clientmap, &client_history, ent);
|
|
|
|
}
|
2008-06-10 20:08:56 +02:00
|
|
|
|
|
|
|
if (action == GEOIP_CLIENT_NETWORKSTATUS ||
|
|
|
|
action == GEOIP_CLIENT_NETWORKSTATUS_V2) {
|
|
|
|
int country_idx = geoip_get_country_by_ip(addr);
|
|
|
|
if (country_idx >= 0 && country_idx < smartlist_len(geoip_countries)) {
|
|
|
|
geoip_country_t *country = smartlist_get(geoip_countries, country_idx);
|
|
|
|
if (action == GEOIP_CLIENT_NETWORKSTATUS)
|
|
|
|
++country->n_v3_ns_requests[REQUEST_HIST_LEN-1];
|
|
|
|
else
|
|
|
|
++country->n_v2_ns_requests[REQUEST_HIST_LEN-1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!client_history_starts) {
|
2007-12-17 23:44:11 +01:00
|
|
|
client_history_starts = now;
|
2008-06-10 20:08:56 +02:00
|
|
|
current_request_period_starts = now;
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** HT_FOREACH helper: remove a clientmap_entry_t from the hashtable if it's
|
|
|
|
* older than a certain time. */
|
2007-12-17 23:44:11 +01:00
|
|
|
static int
|
|
|
|
_remove_old_client_helper(struct clientmap_entry_t *ent, void *_cutoff)
|
|
|
|
{
|
2009-05-26 21:32:56 +02:00
|
|
|
time_t cutoff = *(time_t*)_cutoff / 60;
|
|
|
|
if (ent->last_seen_in_minutes < cutoff) {
|
2007-12-17 23:44:11 +01:00
|
|
|
tor_free(ent);
|
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-26 22:02:52 +02:00
|
|
|
/** Forget about all clients that haven't connected since <b>cutoff</b>.
|
|
|
|
* If <b>cutoff</b> is in the future, clients won't be added to the history
|
|
|
|
* until this time is reached. This is useful to prevent relays that switch
|
|
|
|
* to bridges from reporting unbelievable numbers of clients. */
|
2007-12-17 23:44:11 +01:00
|
|
|
void
|
|
|
|
geoip_remove_old_clients(time_t cutoff)
|
|
|
|
{
|
|
|
|
clientmap_HT_FOREACH_FN(&client_history,
|
|
|
|
_remove_old_client_helper,
|
|
|
|
&cutoff);
|
|
|
|
if (client_history_starts < cutoff)
|
|
|
|
client_history_starts = cutoff;
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Do not mention any country from which fewer than this number of IPs have
|
2008-05-28 20:31:57 +02:00
|
|
|
* connected. This conceivably avoids reporting information that could
|
|
|
|
* deanonymize users, though analysis is lacking. */
|
2009-01-14 07:20:57 +01:00
|
|
|
#define MIN_IPS_TO_NOTE_COUNTRY 1
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Do not report any geoip data at all if we have fewer than this number of
|
|
|
|
* IPs to report about. */
|
2009-01-14 07:20:57 +01:00
|
|
|
#define MIN_IPS_TO_NOTE_ANYTHING 1
|
2008-04-16 02:12:44 +02:00
|
|
|
/** When reporting geoip data about countries, round up to the nearest
|
2007-12-18 22:27:08 +01:00
|
|
|
* multiple of this value. */
|
2007-12-17 23:44:11 +01:00
|
|
|
#define IP_GRANULARITY 8
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Return the time at which we started recording geoip data. */
|
2007-12-17 23:44:16 +01:00
|
|
|
time_t
|
|
|
|
geoip_get_history_start(void)
|
|
|
|
{
|
|
|
|
return client_history_starts;
|
|
|
|
}
|
|
|
|
|
2008-02-12 21:20:52 +01:00
|
|
|
/** Helper type: used to sort per-country totals by value. */
|
2007-12-19 00:45:19 +01:00
|
|
|
typedef struct c_hist_t {
|
2008-02-21 10:01:32 +01:00
|
|
|
char country[3]; /**< Two-letter country code. */
|
|
|
|
unsigned total; /**< Total IP addresses seen in this country. */
|
2007-12-19 00:45:19 +01:00
|
|
|
} c_hist_t;
|
|
|
|
|
|
|
|
/** Sorting helper: return -1, 1, or 0 based on comparison of two
|
|
|
|
* geoip_entry_t. Sort in descending order of total, and then by country
|
|
|
|
* code. */
|
|
|
|
static int
|
|
|
|
_c_hist_compare(const void **_a, const void **_b)
|
|
|
|
{
|
|
|
|
const c_hist_t *a = *_a, *b = *_b;
|
|
|
|
if (a->total > b->total)
|
|
|
|
return -1;
|
|
|
|
else if (a->total < b->total)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return strcmp(a->country, b->country);
|
|
|
|
}
|
|
|
|
|
2008-12-17 23:58:20 +01:00
|
|
|
/** How long do we have to have observed per-country request history before we
|
|
|
|
* are willing to talk about it? */
|
2008-08-29 19:02:26 +02:00
|
|
|
#define GEOIP_MIN_OBSERVATION_TIME (12*60*60)
|
2008-06-10 20:08:56 +02:00
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Return a newly allocated comma-separated string containing entries for all
|
|
|
|
* the countries from which we've seen enough clients connect. The entry
|
|
|
|
* format is cc=num where num is the number of IPs we've seen connecting from
|
2008-12-27 08:30:47 +01:00
|
|
|
* that country, and cc is a lowercased country code. Returns NULL if we don't
|
2007-12-18 22:27:08 +01:00
|
|
|
* want to export geoip data yet. */
|
2007-12-17 23:44:11 +01:00
|
|
|
char *
|
2008-05-29 04:29:35 +02:00
|
|
|
geoip_get_client_history(time_t now, geoip_client_action_t action)
|
2007-12-17 23:44:11 +01:00
|
|
|
{
|
|
|
|
char *result = NULL;
|
2009-05-27 20:19:24 +02:00
|
|
|
int min_observation_time = GEOIP_MIN_OBSERVATION_TIME;
|
2009-05-27 17:52:46 +02:00
|
|
|
#ifdef ENABLE_GEOIP_STATS
|
|
|
|
min_observation_time = DIR_RECORD_USAGE_MIN_OBSERVATION_TIME;
|
|
|
|
#endif
|
2007-12-17 23:44:11 +01:00
|
|
|
if (!geoip_is_loaded())
|
|
|
|
return NULL;
|
2009-05-27 17:52:46 +02:00
|
|
|
if (client_history_starts < (now - min_observation_time)) {
|
2007-12-17 23:44:11 +01:00
|
|
|
char buf[32];
|
|
|
|
smartlist_t *chunks = NULL;
|
2007-12-19 00:45:19 +01:00
|
|
|
smartlist_t *entries = NULL;
|
2007-12-17 23:44:11 +01:00
|
|
|
int n_countries = geoip_get_n_countries();
|
|
|
|
int i;
|
|
|
|
clientmap_entry_t **ent;
|
|
|
|
unsigned *counts = tor_malloc_zero(sizeof(unsigned)*n_countries);
|
|
|
|
unsigned total = 0;
|
2008-06-18 06:34:52 +02:00
|
|
|
unsigned granularity = IP_GRANULARITY;
|
|
|
|
#ifdef ENABLE_GEOIP_STATS
|
2009-05-27 17:52:46 +02:00
|
|
|
granularity = DIR_RECORD_USAGE_GRANULARITY;
|
2008-06-18 06:34:52 +02:00
|
|
|
#endif
|
2007-12-17 23:44:11 +01:00
|
|
|
HT_FOREACH(ent, clientmap, &client_history) {
|
2008-05-29 04:29:35 +02:00
|
|
|
int country;
|
2009-05-26 21:32:56 +02:00
|
|
|
if ((*ent)->action != (int)action)
|
2008-05-29 04:29:35 +02:00
|
|
|
continue;
|
|
|
|
country = geoip_get_country_by_ip((*ent)->ipaddr);
|
2007-12-17 23:44:11 +01:00
|
|
|
if (country < 0)
|
|
|
|
continue;
|
|
|
|
tor_assert(0 <= country && country < n_countries);
|
|
|
|
++counts[country];
|
|
|
|
++total;
|
|
|
|
}
|
2007-12-19 00:45:19 +01:00
|
|
|
/* Don't record anything if we haven't seen enough IPs. */
|
2007-12-17 23:44:11 +01:00
|
|
|
if (total < MIN_IPS_TO_NOTE_ANYTHING)
|
|
|
|
goto done;
|
2007-12-19 00:45:19 +01:00
|
|
|
/* Make a list of c_hist_t */
|
|
|
|
entries = smartlist_create();
|
2007-12-17 23:44:11 +01:00
|
|
|
for (i = 0; i < n_countries; ++i) {
|
|
|
|
unsigned c = counts[i];
|
|
|
|
const char *countrycode;
|
2007-12-19 00:45:19 +01:00
|
|
|
c_hist_t *ent;
|
|
|
|
/* Only report a country if it has a minimum number of IPs. */
|
2007-12-17 23:44:11 +01:00
|
|
|
if (c >= MIN_IPS_TO_NOTE_COUNTRY) {
|
2008-06-18 06:34:52 +02:00
|
|
|
c = round_to_next_multiple_of(c, granularity);
|
2007-12-17 23:44:11 +01:00
|
|
|
countrycode = geoip_get_country_name(i);
|
2007-12-19 00:45:19 +01:00
|
|
|
ent = tor_malloc(sizeof(c_hist_t));
|
|
|
|
strlcpy(ent->country, countrycode, sizeof(ent->country));
|
|
|
|
ent->total = c;
|
|
|
|
smartlist_add(entries, ent);
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
}
|
2007-12-19 00:45:19 +01:00
|
|
|
/* Sort entries. Note that we must do this _AFTER_ rounding, or else
|
|
|
|
* the sort order could leak info. */
|
|
|
|
smartlist_sort(entries, _c_hist_compare);
|
|
|
|
|
|
|
|
/* Build the result. */
|
|
|
|
chunks = smartlist_create();
|
|
|
|
SMARTLIST_FOREACH(entries, c_hist_t *, ch, {
|
|
|
|
tor_snprintf(buf, sizeof(buf), "%s=%u", ch->country, ch->total);
|
|
|
|
smartlist_add(chunks, tor_strdup(buf));
|
|
|
|
});
|
2007-12-17 23:44:11 +01:00
|
|
|
result = smartlist_join_strings(chunks, ",", 0, NULL);
|
|
|
|
done:
|
|
|
|
tor_free(counts);
|
|
|
|
if (chunks) {
|
|
|
|
SMARTLIST_FOREACH(chunks, char *, c, tor_free(c));
|
|
|
|
smartlist_free(chunks);
|
|
|
|
}
|
2007-12-19 00:45:19 +01:00
|
|
|
if (entries) {
|
|
|
|
SMARTLIST_FOREACH(entries, c_hist_t *, c, tor_free(c));
|
|
|
|
smartlist_free(entries);
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-12-17 23:58:20 +01:00
|
|
|
/** Return a newly allocated string holding the per-country request history
|
|
|
|
* for <b>action</b> in a format suitable for an extra-info document, or NULL
|
|
|
|
* on failure. */
|
2008-06-10 20:08:56 +02:00
|
|
|
char *
|
|
|
|
geoip_get_request_history(time_t now, geoip_client_action_t action)
|
|
|
|
{
|
2008-06-18 06:34:52 +02:00
|
|
|
smartlist_t *entries, *strings;
|
2008-06-10 20:08:56 +02:00
|
|
|
char *result;
|
2008-06-18 06:34:52 +02:00
|
|
|
unsigned granularity = IP_GRANULARITY;
|
2009-05-27 20:19:24 +02:00
|
|
|
int min_observation_time = GEOIP_MIN_OBSERVATION_TIME;
|
2008-06-18 06:34:52 +02:00
|
|
|
#ifdef ENABLE_GEOIP_STATS
|
2009-05-27 17:52:46 +02:00
|
|
|
granularity = DIR_RECORD_USAGE_GRANULARITY;
|
|
|
|
min_observation_time = DIR_RECORD_USAGE_MIN_OBSERVATION_TIME;
|
2008-06-18 06:34:52 +02:00
|
|
|
#endif
|
|
|
|
|
2009-05-27 17:52:46 +02:00
|
|
|
if (client_history_starts >= (now - min_observation_time))
|
2008-06-10 20:08:56 +02:00
|
|
|
return NULL;
|
|
|
|
if (action != GEOIP_CLIENT_NETWORKSTATUS &&
|
|
|
|
action != GEOIP_CLIENT_NETWORKSTATUS_V2)
|
|
|
|
return NULL;
|
|
|
|
if (!geoip_countries)
|
|
|
|
return NULL;
|
2008-06-18 06:34:52 +02:00
|
|
|
|
2008-06-10 20:08:56 +02:00
|
|
|
entries = smartlist_create();
|
|
|
|
SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, {
|
|
|
|
uint32_t *n = (action == GEOIP_CLIENT_NETWORKSTATUS)
|
|
|
|
? c->n_v3_ns_requests : c->n_v2_ns_requests;
|
|
|
|
uint32_t tot = 0;
|
|
|
|
int i;
|
2008-06-18 06:34:52 +02:00
|
|
|
c_hist_t *ent;
|
2008-06-10 20:08:56 +02:00
|
|
|
for (i=0; i < REQUEST_HIST_LEN; ++i)
|
|
|
|
tot += n[i];
|
2008-06-10 21:25:25 +02:00
|
|
|
if (!tot)
|
|
|
|
continue;
|
2008-06-18 06:34:52 +02:00
|
|
|
ent = tor_malloc_zero(sizeof(c_hist_t));
|
|
|
|
strlcpy(ent->country, c->countrycode, sizeof(ent->country));
|
|
|
|
ent->total = round_to_next_multiple_of(tot, granularity);
|
|
|
|
smartlist_add(entries, ent);
|
2008-06-10 20:08:56 +02:00
|
|
|
});
|
2008-06-18 06:34:52 +02:00
|
|
|
smartlist_sort(entries, _c_hist_compare);
|
|
|
|
|
|
|
|
strings = smartlist_create();
|
|
|
|
SMARTLIST_FOREACH(entries, c_hist_t *, ent, {
|
|
|
|
char buf[32];
|
|
|
|
tor_snprintf(buf, sizeof(buf), "%s=%u", ent->country, ent->total);
|
|
|
|
smartlist_add(strings, tor_strdup(buf));
|
|
|
|
});
|
|
|
|
result = smartlist_join_strings(strings, ",", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(strings, char *, cp, tor_free(cp));
|
|
|
|
SMARTLIST_FOREACH(entries, c_hist_t *, ent, tor_free(ent));
|
|
|
|
smartlist_free(strings);
|
|
|
|
smartlist_free(entries);
|
2008-06-10 20:08:56 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Store all our geoip statistics into $DATADIR/geoip-stats. */
|
2009-05-27 17:52:46 +02:00
|
|
|
static void
|
2008-05-29 04:29:35 +02:00
|
|
|
dump_geoip_stats(void)
|
|
|
|
{
|
|
|
|
#ifdef ENABLE_GEOIP_STATS
|
|
|
|
time_t now = time(NULL);
|
2008-06-10 20:08:56 +02:00
|
|
|
time_t request_start;
|
2008-05-29 04:29:35 +02:00
|
|
|
char *filename = get_datadir_fname("geoip-stats");
|
|
|
|
char *data_v2 = NULL, *data_v3 = NULL;
|
|
|
|
char since[ISO_TIME_LEN+1], written[ISO_TIME_LEN+1];
|
|
|
|
open_file_t *open_file = NULL;
|
2008-06-10 20:28:10 +02:00
|
|
|
double v2_share = 0.0, v3_share = 0.0;
|
2008-05-29 04:29:35 +02:00
|
|
|
FILE *out;
|
|
|
|
|
|
|
|
data_v2 = geoip_get_client_history(now, GEOIP_CLIENT_NETWORKSTATUS_V2);
|
|
|
|
data_v3 = geoip_get_client_history(now, GEOIP_CLIENT_NETWORKSTATUS);
|
|
|
|
format_iso_time(since, geoip_get_history_start());
|
|
|
|
format_iso_time(written, now);
|
2009-05-27 17:52:46 +02:00
|
|
|
out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND,
|
2008-06-10 20:08:56 +02:00
|
|
|
0600, &open_file);
|
2008-05-29 04:29:35 +02:00
|
|
|
if (!out)
|
|
|
|
goto done;
|
2008-06-10 21:25:25 +02:00
|
|
|
if (fprintf(out, "written %s\nstarted-at %s\nns-ips %s\nns-v2-ips %s\n",
|
2008-06-10 20:08:56 +02:00
|
|
|
written, since,
|
|
|
|
data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0)
|
|
|
|
goto done;
|
|
|
|
tor_free(data_v2);
|
|
|
|
tor_free(data_v3);
|
|
|
|
|
|
|
|
request_start = current_request_period_starts -
|
|
|
|
(n_old_request_periods * REQUEST_HIST_PERIOD);
|
|
|
|
format_iso_time(since, request_start);
|
|
|
|
data_v2 = geoip_get_request_history(now, GEOIP_CLIENT_NETWORKSTATUS_V2);
|
|
|
|
data_v3 = geoip_get_request_history(now, GEOIP_CLIENT_NETWORKSTATUS);
|
2008-06-10 22:11:59 +02:00
|
|
|
if (fprintf(out, "requests-start %s\nn-ns-reqs %s\nn-v2-ns-reqs %s\n",
|
2008-06-10 20:08:56 +02:00
|
|
|
since,
|
|
|
|
data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0)
|
2008-05-29 04:29:35 +02:00
|
|
|
goto done;
|
2008-06-10 20:28:10 +02:00
|
|
|
if (!router_get_my_share_of_directory_requests(&v2_share, &v3_share)) {
|
|
|
|
if (fprintf(out, "v2-ns-share %0.2lf%%\n", v2_share*100) < 0)
|
|
|
|
goto done;
|
|
|
|
if (fprintf(out, "v3-ns-share %0.2lf%%\n", v3_share*100) < 0)
|
|
|
|
goto done;
|
|
|
|
}
|
2008-05-29 04:29:35 +02:00
|
|
|
|
|
|
|
finish_writing_to_file(open_file);
|
|
|
|
open_file = NULL;
|
|
|
|
done:
|
|
|
|
if (open_file)
|
|
|
|
abort_writing_to_file(open_file);
|
|
|
|
tor_free(filename);
|
|
|
|
tor_free(data_v2);
|
|
|
|
tor_free(data_v3);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-07-05 20:48:16 +02:00
|
|
|
/** Store all our geoip statistics as entry guards into
|
|
|
|
* $DATADIR/entry-stats. */
|
|
|
|
static void
|
|
|
|
dump_entry_stats(void)
|
|
|
|
{
|
|
|
|
#ifdef ENABLE_ENTRY_STATS
|
|
|
|
time_t now = time(NULL);
|
|
|
|
char *filename = get_datadir_fname("entry-stats");
|
|
|
|
char *data = NULL;
|
|
|
|
char since[ISO_TIME_LEN+1], written[ISO_TIME_LEN+1];
|
|
|
|
open_file_t *open_file = NULL;
|
|
|
|
FILE *out;
|
|
|
|
|
|
|
|
data = geoip_get_client_history(now, GEOIP_CLIENT_CONNECT);
|
|
|
|
format_iso_time(since, geoip_get_history_start());
|
|
|
|
format_iso_time(written, now);
|
|
|
|
out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND,
|
|
|
|
0600, &open_file);
|
|
|
|
if (!out)
|
|
|
|
goto done;
|
|
|
|
if (fprintf(out, "written %s\nstarted-at %s\nips %s\n",
|
|
|
|
written, since, data ? data : "") < 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
finish_writing_to_file(open_file);
|
|
|
|
open_file = NULL;
|
|
|
|
done:
|
|
|
|
if (open_file)
|
|
|
|
abort_writing_to_file(open_file);
|
|
|
|
tor_free(filename);
|
|
|
|
tor_free(data);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Helper used to implement GETINFO ip-to-country/... controller command. */
|
2007-12-17 23:44:18 +01:00
|
|
|
int
|
|
|
|
getinfo_helper_geoip(control_connection_t *control_conn,
|
|
|
|
const char *question, char **answer)
|
|
|
|
{
|
|
|
|
(void)control_conn;
|
|
|
|
if (geoip_is_loaded() && !strcmpstart(question, "ip-to-country/")) {
|
|
|
|
int c;
|
|
|
|
uint32_t ip;
|
|
|
|
struct in_addr in;
|
|
|
|
question += strlen("ip-to-country/");
|
|
|
|
if (tor_inet_aton(question, &in) != 0) {
|
|
|
|
ip = ntohl(in.s_addr);
|
|
|
|
c = geoip_get_country_by_ip(ip);
|
|
|
|
*answer = tor_strdup(geoip_get_country_name(c));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Release all storage held by the GeoIP database. */
|
|
|
|
static void
|
|
|
|
clear_geoip_db(void)
|
2007-12-17 23:44:11 +01:00
|
|
|
{
|
|
|
|
if (geoip_countries) {
|
2008-06-10 20:08:56 +02:00
|
|
|
SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, tor_free(c));
|
2007-12-17 23:44:11 +01:00
|
|
|
smartlist_free(geoip_countries);
|
|
|
|
}
|
|
|
|
if (country_idxplus1_by_lc_code)
|
|
|
|
strmap_free(country_idxplus1_by_lc_code, NULL);
|
|
|
|
if (geoip_entries) {
|
|
|
|
SMARTLIST_FOREACH(geoip_entries, geoip_entry_t *, ent, tor_free(ent));
|
|
|
|
smartlist_free(geoip_entries);
|
|
|
|
}
|
|
|
|
geoip_countries = NULL;
|
|
|
|
country_idxplus1_by_lc_code = NULL;
|
|
|
|
geoip_entries = NULL;
|
|
|
|
}
|
2007-12-17 23:44:18 +01:00
|
|
|
|
2007-12-18 22:27:08 +01:00
|
|
|
/** Release all storage held in this file. */
|
|
|
|
void
|
|
|
|
geoip_free_all(void)
|
|
|
|
{
|
|
|
|
clientmap_entry_t **ent, **next, *this;
|
|
|
|
for (ent = HT_START(clientmap, &client_history); ent != NULL; ent = next) {
|
|
|
|
this = *ent;
|
|
|
|
next = HT_NEXT_RMV(clientmap, &client_history, ent);
|
|
|
|
tor_free(this);
|
|
|
|
}
|
|
|
|
HT_CLEAR(clientmap, &client_history);
|
|
|
|
|
|
|
|
clear_geoip_db();
|
|
|
|
}
|
|
|
|
|