diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-17 15:20:00 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-17 15:20:00 +0000 |
| commit | b713b370bfdd2be8f1456d11f7e087c9cf7cdee7 (patch) | |
| tree | 2f9e2c06a9f0a042f56b06a96f66456fde68d07b /doc | |
| parent | e3b1d059c7f17bf82cf9ac80a50642bb4db6dffe (diff) | |
| download | tor-b713b370bfdd2be8f1456d11f7e087c9cf7cdee7.tar.gz tor-b713b370bfdd2be8f1456d11f7e087c9cf7cdee7.zip | |
r9060@totoro: nickm | 2006-10-17 11:12:48 -0400
Apply patch from Mike Perry: add more reasons for circuit destroys. (Slightly tweaked to avoid allocating a number for an "internal" reason.)
svn:r8739
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/control-spec.txt | 7 | ||||
| -rw-r--r-- | doc/tor-spec.txt | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/control-spec.txt b/doc/control-spec.txt index 0d06a6423a..375e3eab72 100644 --- a/doc/control-spec.txt +++ b/doc/control-spec.txt @@ -777,16 +777,17 @@ $Id$ Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" / "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" / - "OR_IDENTITY" / "OR_CONN_CLOSED" + "OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" / + "FINISHED" / "DESTROYED" / "NOPATH" / "NOSUCHSERVICE" The path is provided only when the circuit has been extended at least one hop. The "REASON" field is provided only for FAILED and CLOSED events, and only if extended events are enabled (see 3.19). Clients MUST accept reasons - not listed above. + not listed above. Reasons are as given in tor-spec.txt, except for: - [XXXX Explain what the reasons mean.] + NOPATH (Not enough nodes to make circuit) 4.1.2. Stream status changed diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt index cf6f78fb44..2ebd350db5 100644 --- a/doc/tor-spec.txt +++ b/doc/tor-spec.txt @@ -228,7 +228,7 @@ TODO: associated with. The 'Command' field holds one of the following values: - 0 -- PADDING (Padding) (See Sec 7.2) + 0 -- PADDING (Padding) (See Sec 7.2) 1 -- CREATE (Create a circuit) (See Sec 5.1) 2 -- CREATED (Acknowledge create) (See Sec 5.1) 3 -- RELAY (End-to-end data) (See Sec 5.5 and 6) @@ -563,6 +563,10 @@ TODO: as expected.) 8 -- OR_CONN_CLOSED (The OR connection that was carrying this circuit died.) + 9 -- FINISHED (The circuit has expired for being dirty or old.) + 10 -- TIMEOUT (Circuit construction took too long) + 11 -- DESTROYED (The circuit was destroyed w/o client TRUNCATE) + 12 -- NOSUCHSERVICE (Request for unknown hidden service) [Versions of Tor prior to 0.1.0.11 didn't send reasons; implementations MUST accept empty TRUNCATED and DESTROY cells.] |