mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Make "Nowhere" explicitly listable in torrc.

Browse Source 
We already had the country code ?? indicating an unknown country, so all we
needed to do to make unknown countries excludable was to make the ?? code
discoverable.
This commit is contained in:
Nick Mathewson 2009-09-15 13:41:36 -04:00
parent 15424bf800
commit 8fca6fb2aa
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/nowhereland Normal file
View File

@ -0,0 +1,6 @@
o Minor features:
- Add support for the country code "{??}" in torrc options like
ExcludeNodes, to indicate all routers of unknown country. Fixes bug
1094.

1
src/or/geoip.c
View File

@ -200,6 +200,7 @@ geoip_load_file(const char *filename, or_options_t *options)
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) {
SMARTLIST_FOREACH(geoip_entries, geoip_entry_t *, e, tor_free(e));

4
src/or/routerlist.c
View File

@ -5335,6 +5335,10 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr,
if (country < 0 && addr)
country = geoip_get_country_by_ip(tor_addr_to_ipv4h(addr));
/* XXXX can we safely move this into geoip_get_country_by_ip? */
if (country < 0)
country = 0;
if (country >= 0 && country < set->n_countries &&
bitarray_is_set(set->countries, country))
return 2;