diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 18 | ||||
| -rw-r--r-- | src/or/or.h | 6 |
3 files changed, 20 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 574b69c818..40209130f5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -143,6 +143,8 @@ static config_var_t _option_vars[] = { V(AuthDirRejectUnlisted, BOOL, "0"), V(AuthDirListBadDirs, BOOL, "0"), V(AuthDirListBadExits, BOOL, "0"), + V(AuthDirMaxServersPerAddr, UINT, "2"), + V(AuthDirMaxServersPerAuthAddr,UINT, "5"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0bc852357c..a4e29c86cd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1965,18 +1965,24 @@ _compare_routerinfo_by_ip_and_bw(const void **a, const void **b) static digestmap_t * get_possible_sybil_list(const smartlist_t *routers) { + or_options_t *options = get_options(); digestmap_t *omit_as_sybil; smartlist_t *routers_by_ip = smartlist_create(); uint32_t last_addr; int addr_count; + /* Allow at most this number of Tor servers on a single IP address, ... */ + int max_with_same_addr = options->AuthDirMaxServersPerAddr; + /* ... unless it's a directory authority, in which case allow more. */ + int max_with_same_addr_on_authority = options->AuthDirMaxServersPerAuthAddr; + if (max_with_same_addr <= 0) + max_with_same_addr = INT_MAX; + if (max_with_same_addr_on_authority <= 0) + max_with_same_addr_on_authority = INT_MAX; + smartlist_add_all(routers_by_ip, routers); smartlist_sort(routers_by_ip, _compare_routerinfo_by_ip_and_bw); omit_as_sybil = digestmap_new(); -/* 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, @@ -1984,9 +1990,9 @@ get_possible_sybil_list(const smartlist_t *routers) if (last_addr != ri->addr) { last_addr = ri->addr; addr_count = 1; - } else if (++addr_count > MAX_WITH_SAME_ADDR) { + } else if (++addr_count > max_with_same_addr) { if (!router_addr_is_trusted_dir(ri->addr) || - addr_count > MAX_WITH_SAME_ADDR_ON_AUTHORITY) + addr_count > max_with_same_addr_on_authority) digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri); } }); diff --git a/src/or/or.h b/src/or/or.h index f00934cdb5..2342fea3d6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2240,6 +2240,12 @@ typedef struct { * and vote for all other exits as good. */ int AuthDirRejectUnlisted; /**< Boolean: do we reject all routers that * aren't named in our fingerprint file? */ + int AuthDirMaxServersPerAddr; /**< Do not permit more than this + * number of servers per IP address. */ + int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this + * number of servers per IP address shared + * with an authority. */ + char *AccountingStart; /**< How long is the accounting interval, and when * does it start? */ uint64_t AccountingMax; /**< How many bytes do we allow per accounting |