diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-19 00:24:29 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-19 00:24:29 +0000 |
| commit | adf95e7f00b293a076c46e3288211b29b4b3de3e (patch) | |
| tree | e9c641806a96fbd8f4ba4bedcd3548db106c63ae | |
| parent | 84c3a1917045b11c412b1a87aa59254eb304809a (diff) | |
| download | tor-adf95e7f00b293a076c46e3288211b29b4b3de3e.tar.gz tor-adf95e7f00b293a076c46e3288211b29b4b3de3e.zip | |
r12794@catbus: nickm | 2007-05-18 20:24:26 -0400
Make caches-extra-info lines parseable.
svn:r10215
| -rw-r--r-- | doc/spec/dir-spec.txt | 6 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt index 5fab87c002..343ae8e726 100644 --- a/doc/spec/dir-spec.txt +++ b/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 diff --git a/src/or/router.c b/src/or/router.c index 877d4f851c..28a801bf9e 100644 --- a/src/or/router.c +++ b/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" : ""); |