[or-cvs] r13090: Make proposal-109 behavior optional. (in tor/trunk: . doc src/or)
nickm at seul.org
nickm at seul.org
Thu Jan 10 16:08:47 UTC 2008
Author: nickm
Date: 2008-01-10 11:08:47 -0500 (Thu, 10 Jan 2008)
New Revision: 13090
Modified:
tor/trunk/
tor/trunk/ChangeLog
tor/trunk/doc/TODO
tor/trunk/doc/tor.1.in
tor/trunk/src/or/config.c
tor/trunk/src/or/dirserv.c
tor/trunk/src/or/or.h
Log:
r17548 at catbus: nickm | 2008-01-10 11:08:12 -0500
Make proposal-109 behavior optional.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r17548] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/ChangeLog 2008-01-10 16:08:47 UTC (rev 13090)
@@ -46,6 +46,11 @@
that don't otherwise fit into the torrc file.
- The SETCONF command now handles quoted values correctly.
+ o Minor features (directory authorities):
+ - New configuration options to override default maximum number of
+ servers allowed on a single IP address. This is important
+ for running a test network on a single host.
+
o Minor features (other):
- Add hidden services and DNSPorts to the list of things that make
Tor accept that it has running ports. Change starting Tor with
Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/doc/TODO 2008-01-10 16:08:47 UTC (rev 13090)
@@ -21,7 +21,7 @@
R - add a geoip file
W - figure out license
R - let bridges set relaybandwidthrate as low as 5kb
-N - we need a config option to turn off proposal 109 behavior,
+ o we need a config option to turn off proposal 109 behavior,
RK- make it easier to set up a private tor network on your own computer
is very hard.
- FAQ entry which is wrong
Modified: tor/trunk/doc/tor.1.in
===================================================================
--- tor/trunk/doc/tor.1.in 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/doc/tor.1.in 2008-01-10 16:08:47 UTC (rev 13090)
@@ -1129,6 +1129,17 @@
rejects all uploaded server descriptors that aren't explicitly listed
in the fingerprints file. This acts as a "panic button" if we get
Sybiled. (Default: 0)
+.LP
+.TP
+\fBAuthDirMaxServersPerAddr\fR \fINUM\fP
+Authoritative directories only. The maximum number of servers that we
+will list as acceptable on a single IP address. Set this to "0" for
+"no limit". (Default: 2)
+.LP
+.TP
+\fBAuthDirMaxServersPerAuthAddr\fR \fINUM\fP
+Authoritative directories only. Like AuthDirMaxServersPerAddr, but
+applies to addresses shared with directory authorities. (Default: 5)
.SH HIDDEN SERVICE OPTIONS
.PP
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/src/or/config.c 2008-01-10 16:08:47 UTC (rev 13090)
@@ -143,6 +143,8 @@
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"),
Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/src/or/dirserv.c 2008-01-10 16:08:47 UTC (rev 13090)
@@ -1965,18 +1965,24 @@
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 @@
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);
}
});
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2008-01-10 14:21:22 UTC (rev 13089)
+++ tor/trunk/src/or/or.h 2008-01-10 16:08:47 UTC (rev 13090)
@@ -2240,6 +2240,12 @@
* 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
More information about the tor-commits
mailing list