nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set up the geoip country table right even if not called normally

Browse Source
This commit is contained in:
Nick Mathewson 2010-07-31 15:14:48 -04:00
parent 4dd4d240b7
commit b175c584d5
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/or/geoip.c
View File

@ -17,6 +17,7 @@
#include "routerlist.h" #include "routerlist.h"
static void clear_geoip_db(void); static void clear_geoip_db(void);
static void init_geoip_countries(void);
/** An entry from the GeoIP file: maps an IP range to a country. */ /** An entry from the GeoIP file: maps an IP range to a country. */
typedef struct geoip_entry_t { typedef struct geoip_entry_t {
@ -106,11 +107,11 @@ geoip_parse_entry(const char *line)
{ {
unsigned int low, high; unsigned int low, high;
char b[3]; char b[3];
if (!geoip_countries) { if (!geoip_countries)
geoip_countries = smartlist_create(); init_geoip_countries();
if (!geoip_entries)
geoip_entries = smartlist_create(); geoip_entries = smartlist_create();
country_idxplus1_by_lc_code = strmap_new();
}
while (TOR_ISSPACE(*line)) while (TOR_ISSPACE(*line))
++line; ++line;
if (*line == '#') if (*line == '#')
@ -165,6 +166,24 @@ should_record_bridge_info(or_options_t *options)
return options->BridgeRelay && options->BridgeRecordUsageByCountry; return options->BridgeRelay && options->BridgeRecordUsageByCountry;
} }
/** Set up a new list of geoip countries with no countries (yet) set in it,
* except for the unknown country.
*/
static void
init_geoip_countries(void)
{
geoip_country_t *geoip_unresolved;
geoip_countries = smartlist_create();
/* Add a geoip_country_t for requests that could not be resolved to a
* country as first element (index 0) to geoip_countries. */
geoip_unresolved = tor_malloc_zero(sizeof(geoip_country_t));
strlcpy(geoip_unresolved->countrycode, "??",
sizeof(geoip_unresolved->countrycode));
smartlist_add(geoip_countries, geoip_unresolved);
country_idxplus1_by_lc_code = strmap_new();
strmap_set_lc(country_idxplus1_by_lc_code, "??", (void*)(1));
}
/** Clear the GeoIP database and reload it from the file /** Clear the GeoIP database and reload it from the file
* <b>filename</b>. Return 0 on success, -1 on failure. * <b>filename</b>. Return 0 on success, -1 on failure.
* *
@ -190,18 +209,8 @@ geoip_load_file(const char *filename, or_options_t *options)
filename, msg); filename, msg);
return -1; return -1;
} }
if (!geoip_countries) { if (!geoip_countries)
geoip_country_t *geoip_unresolved; init_geoip_countries();
geoip_countries = smartlist_create();
/* Add a geoip_country_t for requests that could not be resolved to a
* country as first element (index 0) to geoip_countries. */
geoip_unresolved = tor_malloc_zero(sizeof(geoip_country_t));
strlcpy(geoip_unresolved->countrycode, "??",
sizeof(geoip_unresolved->countrycode));
smartlist_add(geoip_countries, geoip_unresolved);
country_idxplus1_by_lc_code = strmap_new();
strmap_set_lc(country_idxplus1_by_lc_code, "??", (void*)(1));
}
if (geoip_entries) { if (geoip_entries) {
SMARTLIST_FOREACH(geoip_entries, geoip_entry_t *, e, tor_free(e)); SMARTLIST_FOREACH(geoip_entries, geoip_entry_t *, e, tor_free(e));
smartlist_free(geoip_entries); smartlist_free(geoip_entries);
@ -419,7 +428,7 @@ geoip_note_client_seen(geoip_client_action_t action,
if (options->BridgeRelay) { if (options->BridgeRelay) {
while (current_request_period_starts + REQUEST_HIST_PERIOD < now) { while (current_request_period_starts + REQUEST_HIST_PERIOD < now) {
if (!geoip_countries) if (!geoip_countries)
geoip_countries = smartlist_create(); init_geoip_countries();
if (!current_request_period_starts) { if (!current_request_period_starts) {
current_request_period_starts = now; current_request_period_starts = now;
break; break;