[or-cvs] r19194: {tor} Limit uploaded directory documents to be 16M rather than 500 (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2009-03-31 00:03:37 -0400 (Tue, 31 Mar 2009)
New Revision: 19194

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/or.h
Log:
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 ;).


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-03-31 04:01:55 UTC (rev 19193)
+++ tor/trunk/ChangeLog	2009-03-31 04:03:37 UTC (rev 19194)
@@ -16,6 +16,10 @@
       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.

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2009-03-31 04:01:55 UTC (rev 19193)
+++ tor/trunk/src/or/or.h	2009-03-31 04:03:37 UTC (rev 19194)
@@ -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