aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-10-01 22:31:13 +0000
committerNick Mathewson <nickm@torproject.org>2003-10-01 22:31:13 +0000
commit6ac42f5ec059421fdfbeb3ef8f2b4448c14b2947 (patch)
tree72e804415c831e11dc0e18685dca06373a96c413 /doc
parent7f10126a1e7184b0fc6ae47ca2efc8e96f13d6d5 (diff)
downloadtor-6ac42f5ec059421fdfbeb3ef8f2b4448c14b2947.tar
tor-6ac42f5ec059421fdfbeb3ef8f2b4448c14b2947.tar.gz
Make testcases run again; more sanity checking to descriptor generation.
svn:r532
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO1
-rw-r--r--doc/tor-spec.txt6
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/TODO b/doc/TODO
index 0e657c260..108da0565 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -44,7 +44,6 @@ ARMA . find an application that uses half-open connections: openssh
NICK - instruments ORs to report stats
- average cell fullness
- average bandwidth used
- - others?
. integrate rep_ok functions, see what breaks
ARMA - configure log files. separate log file, separate severities.
ARMA - what assumptions break if we fclose(0) when we daemonize?
diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt
index 9f6e0fdfe..850440e06 100644
--- a/doc/tor-spec.txt
+++ b/doc/tor-spec.txt
@@ -441,7 +441,7 @@ which reveals the downstream node.
(Unless otherwise noted, tokens on the same line are space-separated.)
Router ::= Router-Line Date-Line Onion-Key Link-Key Signing-Key Exit-Policy Router-Signature NL
-Router-Line ::= "router" address ORPort APPort DirPort bandwidth NL
+Router-Line ::= "router" nickname address ORPort APPort DirPort bandwidth NL
Date-Line ::= "published" YYYY-MM-DD HH:MM:SS NL
Onion-key ::= "onion-key" NL a public key in PEM format NL
Link-key ::= "link-key" NL a public key in PEM format NL
@@ -457,9 +457,11 @@ APPort ::= where the router listens for applications (speaking socks)
DirPort ::= where the router listens for directory download requests
bandwidth ::= maximum bandwidth, in bytes/s
+nickname ::= between 1 and 32 alphanumeric characters. case-insensitive.
Example:
-router moria.mit.edu 9001 9021 9031 100000
+router moria1 moria.mit.edu 9001 9021 9031 100000
+published 2003-09-24 19:36:05
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K