nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak the implementation of proposal 109 slightly: allow at most

Browse Source 
two Tor servers on the same IP address, except if it's the location
of a directory authority, in which case allow five.


svn:r11842
This commit is contained in:
Roger Dingledine 2007-10-10 19:53:08 +00:00
parent 55520a2d95
commit f6b25613b8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -30,6 +30,11 @@ Changes in version 0.2.0.8-alpha - 2007-10-12
consensus. consensus.
- Caches now download v3 network status documents as needed. - Caches now download v3 network status documents as needed.
o Minor features (network statuses):
- Tweak the implementation of proposal 109 slightly: allow at most
two Tor servers on the same IP address, except if it's the location
of a directory authority, in which case allow five.
o Major bugfixes (performance): o Major bugfixes (performance):
- Fix really bad O(n^2) performance when parsing a long list of routers: - Fix really bad O(n^2) performance when parsing a long list of routers:
Instead of searching the entire list for an "extra-info " string which Instead of searching the entire list for an "extra-info " string which

9
src/or/dirserv.c
View File

@ -1840,7 +1840,10 @@ get_possible_sybil_list(const smartlist_t *routers)
smartlist_sort(routers_by_ip, _compare_routerinfo_by_ip_and_bw); smartlist_sort(routers_by_ip, _compare_routerinfo_by_ip_and_bw);
omit_as_sybil = digestmap_new(); omit_as_sybil = digestmap_new();
#define MAX_WITH_SAME_ADDR 3 /* Allow at most this number of Tor servers on a single IP address, ... */
#define MAX_WITH_SAME_ADDR 2
/* ... unless it's a directory authority, in which case allow more. */
#define MAX_WITH_SAME_ADDR_ON_AUTHORITY 5
last_addr = 0; last_addr = 0;
addr_count = 0; addr_count = 0;
SMARTLIST_FOREACH(routers_by_ip, routerinfo_t *, ri, SMARTLIST_FOREACH(routers_by_ip, routerinfo_t *, ri,
@ -1849,7 +1852,9 @@ get_possible_sybil_list(const smartlist_t *routers)
last_addr = ri->addr; last_addr = ri->addr;
addr_count = 1; addr_count = 1;
} else if (++addr_count > MAX_WITH_SAME_ADDR) { } else if (++addr_count > MAX_WITH_SAME_ADDR) {
digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri); if (!router_digest_is_trusted_dir(ri->cache_info.identity_digest) ||
addr_count > MAX_WITH_SAME_ADDR_ON_AUTHORITY)
digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri);
} }
}); });