Commit f6b25613 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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.


svn:r11842
parent 55520a2d

ChangeLog

+5 −0
Changes for ChangeLog: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ Changes in version 0.2.0.8-alpha - 2007-10-12 
      consensus.

    - 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):

    - 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

src/or/dirserv.c

+6 −1
Changes for src/or/dirserv.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1840,7 +1840,10 @@ get_possible_sybil_list(const smartlist_t *routers) 
  smartlist_sort(routers_by_ip, _compare_routerinfo_by_ip_and_bw);

  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;

  addr_count = 0;

  SMARTLIST_FOREACH(routers_by_ip, routerinfo_t *, ri,
@@ -1849,6 +1852,8 @@ get_possible_sybil_list(const smartlist_t *routers) 
        last_addr = ri->addr;

        addr_count = 1;

      } else if (++addr_count > MAX_WITH_SAME_ADDR) {

        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);

      }

    });