Explorar o código

introduce a new orconn_status "NEW"

svn:r6100
Roger Dingledine %!s(int64=19) %!d(string=hai) anos
pai
achega
39964206d8
Modificáronse 1 ficheiros con 13 adicións e 4 borrados
  1. 13 4
      doc/control-spec.txt

+ 13 - 4
doc/control-spec.txt

@@ -681,9 +681,9 @@ $Id$
                "SENTCONNECT"  / ; Sent a connect cell along a circuit
                "SENTCONNECT"  / ; Sent a connect cell along a circuit
                "SENTRESOLVE"  / ; Sent a resolve cell along a circuit
                "SENTRESOLVE"  / ; Sent a resolve cell along a circuit
                "SUCCEEDED"    / ; Received a reply; stream established
                "SUCCEEDED"    / ; Received a reply; stream established
-               "FAILED"       / ; Stream failed and not retriable.
+               "FAILED"       / ; Stream failed and not retriable
                "CLOSED"       / ; Stream closed
                "CLOSED"       / ; Stream closed
-               "DETACHED"       ; Detached from circuit; still retriable.
+               "DETACHED"       ; Detached from circuit; still retriable
 
 
        Target = Address ":" Port
        Target = Address ":" Port
 
 
@@ -693,9 +693,18 @@ $Id$
 4.1.3. OR Connection status changed
 4.1.3. OR Connection status changed
 
 
   The syntax is:
   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
 4.1.4. Bandwidth used in the last second