summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-03-31 04:03:37 +0000
committerRoger Dingledine <arma@torproject.org>2009-03-31 04:03:37 +0000
commit7170c5b4f8638115a4225f6b58470f423ace466b (patch)
treee3c4e7099cdbd6ef10a1f7c58f81a0b7a47df6dd
parent793f1ce007e978ad961a3dea0fda32299cb47e5b (diff)
downloadtor-7170c5b4f8638115a4225f6b58470f423ace466b.tar.gz
tor-7170c5b4f8638115a4225f6b58470f423ace466b.zip
Limit uploaded directory documents to be 16M rather than 500K.
The directory authorities were refusing v3 consensus votes from other authorities, since the votes are now 504K. Fixes bug 959; bugfix on 0.0.2pre17 (where we raised it from 50K to 500K ;). svn:r19194
-rw-r--r--ChangeLog4
-rw-r--r--src/or/or.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a45a0f72d..9f235b8c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@ Changes in version 0.2.1.14-??? - 2009-04-??
duplicating a string at the end of a page. This bug was
harmless for now, but could have meant crashes later. Fix by
lark. Bugfix on 0.2.1.1-alpha.
+ - Limit uploaded directory documents to be 16M rather than 500K.
+ The directory authorities were refusing v3 consensus votes from
+ other authorities, since the votes are now 504K. Fixes bug 959;
+ bugfix on 0.0.2pre17 (where we raised it from 50K to 500K ;).
- Directory authorities should never send a 503 "busy" response to
requests for votes or keys. Bugfix on 0.2.0.8-alpha; exposed by
bug 959.
diff --git a/src/or/or.h b/src/or/or.h
index 168ace863c..213fdb79c3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -141,7 +141,7 @@
#define MAX_HEADERS_SIZE 50000
/** Maximum size, in bytes, for any directory object that we're accepting
* as an upload. */
-#define MAX_DIR_UL_SIZE 500000
+#define MAX_DIR_UL_SIZE MAX_BUF_SIZE
/** Maximum size, in bytes, of a single router descriptor uploaded to us
* as a directory authority. Caches and clients fetch whatever descriptors