r12794@catbus: nickm | 2007-05-18 20:24:26 -0400

 Make caches-extra-info lines parseable.


svn:r10215

doc/spec/dir-spec.txt

@@ -488,12 +488,12 @@ $Id$
          used, and should still be recognized by new code until Tor 0.1.2.x
          is obsolete.]
 
-   "caches-extra-info" 0|1 NL
+   "caches-extra-info" NL
 
        [At most once.]
 
-       True if this router is a directory cache that provides extra-info
-       documents.  If absent, the value should be treated as false.
+       Present only if this router is a directory cache that provides
+       extra-info documents.
 
        [Versions before 0.2.0.1-alpha don't recognize this, and versions
         before 0.1.2.5-alpha will reject descriptors containing it unless

src/or/router.c

@@ -1357,7 +1357,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
     (int) router->bandwidthburst,
     (int) router->bandwidthcapacity,
     extra_info_digest,
-    options->DownloadExtraInfo ? "opt caches-extra-info 1\n" : "",
+    options->DownloadExtraInfo ? "opt caches-extra-info\n" : "",
     onion_pkey, identity_pkey,
     family_line, bandwidth_usage,
     we_are_hibernating() ? "opt hibernating 1\n" : "");