summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-08 22:26:36 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-08 22:26:36 +0000
commit39964206d8fb32d79ebccd9fd52755b76c29e722 (patch)
treec8156f73c9d17ba0fe00e35f22de8e37cc79b4ca
parent8db1e363c99938601ca8f75b60709c100d2f0c5b (diff)
downloadtor-39964206d8fb32d79ebccd9fd52755b76c29e722.tar.gz
tor-39964206d8fb32d79ebccd9fd52755b76c29e722.zip
introduce a new orconn_status "NEW"
svn:r6100
-rw-r--r--doc/control-spec.txt17
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index 32fcc28759..91e21e048b 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -681,9 +681,9 @@ $Id$
"SENTCONNECT" / ; Sent a connect cell along a circuit
"SENTRESOLVE" / ; Sent a resolve cell along a circuit
"SUCCEEDED" / ; Received a reply; stream established
- "FAILED" / ; Stream failed and not retriable.
+ "FAILED" / ; Stream failed and not retriable
"CLOSED" / ; Stream closed
- "DETACHED" ; Detached from circuit; still retriable.
+ "DETACHED" ; Detached from circuit; still retriable
Target = Address ":" Port
@@ -693,9 +693,18 @@ $Id$
4.1.3. OR Connection status changed
The syntax is:
- "650" SP "ORCONN" SP ServerID SP ORStatus
+ "650" SP "ORCONN" SP (ServerID / Target) SP ORStatus
- ORStatus = "LAUNCHED" / "CONNECTED" / "FAILED" / "CLOSED"
+ ORStatus = "NEW" / "LAUNCHED" / "CONNECTED" / "FAILED" / "CLOSED"
+
+ NEW is for incoming connections, and LAUNCHED is for outgoing
+ connections. CONNECTED means the TLS handshake has finished (in
+ either direction). FAILED means a connection is being closed that
+ hasn't finished its handshake, and CLOSED is for connections that
+ have handshaked.
+
+ A ServerID is specified unless it's a NEW connection, in which
+ case we don't know what server it is yet, so we use Address:Port.
4.1.4. Bandwidth used in the last second