diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-12-23 15:47:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-12-23 15:47:15 +0000 |
| commit | 4417017197b3523ead180728b3a91638bf17863f (patch) | |
| tree | 956f8c2c1fd962b5ce18730a82f87c31a8974c8e /doc/dir-spec.txt | |
| parent | 9afeacac3b8742c75e36a8b68a9f93ac8c292c07 (diff) | |
| download | tor-4417017197b3523ead180728b3a91638bf17863f.tar.gz tor-4417017197b3523ead180728b3a91638bf17863f.zip | |
Comments from cat: "space" should include or exclude tabs. We include tabs, so specify that.
svn:r5635
Diffstat (limited to 'doc/dir-spec.txt')
| -rw-r--r-- | doc/dir-spec.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/dir-spec.txt b/doc/dir-spec.txt index 65b2ddb878..999b53b90d 100644 --- a/doc/dir-spec.txt +++ b/doc/dir-spec.txt @@ -117,12 +117,15 @@ $Id$ for clarity between sections; these blank lines are ignored. Implementations MUST NOT depend on blank lines in any particular location. + As used here, "whitespace" is a sequence of 1 or more tab or space + characters. + The preamble contains: "network-status-version" -- A document format version. For this specification, the version is "2". "dir-source" -- The authority's hostname, current IP address, and - directory port, all separated by spaces. + directory port, all separated by whitespace. "fingerprint" -- A base16-encoded hash of the signing key's fingerprint, with no additional spaces added. "contact" -- An arbitrary string describing how to contact the @@ -134,7 +137,7 @@ $Id$ "server-versions" -- A comma-separated list of recommended server versions. "published" -- The publication time for this network-status object. - "dir-options" -- A set of flags separated by spaces: + "dir-options" -- A set of flags, in any order, separated by whitespace: "Names" if this directory authority performs name bindings. "Versions" if this directory authority recommends software versions. @@ -148,7 +151,8 @@ $Id$ For each router, the router entry contains: (This format is designed for conciseness.) - "r" -- followed by the following elements, separated by spaces: + "r" -- followed by the following elements, in order, separated by + whitespace: - The OR's nickname, - A hash of its identity key, encoded in base64, with trailing = signs removed. @@ -160,7 +164,7 @@ $Id$ - An IP address - An OR port - A directory port (or "0" for none") - "s" -- A series of space-separated status flags: + "s" -- A series of whitespace-separated status flags, in any order: "Authority" if the router is a directory authority. "Exit" if the router is useful for building general-purpose exit circuits. |