[or-cvs] Implement the common case of ATTACHSTREAM.

[Nick Mathewson]

Update of /home/or/cvsroot/tor/doc
In directory moria.mit.edu:/tmp/cvs-serv32619/doc

Modified Files:
	TODO control-spec.txt 
Log Message:
Implement the common case of ATTACHSTREAM.

Index: TODO
===================================================================
RCS file: /home/or/cvsroot/tor/doc/TODO,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- TODO	11 Mar 2005 21:49:29 -0000	1.276
+++ TODO	12 Mar 2005 04:22:00 -0000	1.277
@@ -72,13 +72,15 @@
     - EXTENDCIRCUIT
 R     - revised circ selection stuff.
       - Implement controller interface.
-    - ATTACHSTREAM
-      - Make streams have an 'unattached and not-automatically-attachable'
+    . ATTACHSTREAM
+      o Make streams have an 'unattached and not-automatically-attachable'
         state. ("Controller managed.")
-      - Add support to put new streams into this state rather than try to
+      o Add support to put new streams into this state rather than try to
         attach them automatically.  ("Hidden" config option.)
+      o Implement 'attach stream X to circuit Y' logic.
       - Time out never-attached streams.
-      - Implement 'attach stream X to circuit Y' logic.
+      - If we never get a CONNECTED back, we should put the stream back in
+        CONTROLLER_WAIT, not in CIRCUIT_WAIT.
     - Tests for new controller features
 R . HTTPS proxy for OR CONNECT stuff. (For outgoing SSL connections to
     other ORs.)

Index: control-spec.txt
===================================================================
RCS file: /home/or/cvsroot/tor/doc/control-spec.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- control-spec.txt	2 Mar 2005 20:54:09 -0000	1.19
+++ control-spec.txt	12 Mar 2005 04:22:00 -0000	1.20
@@ -100,6 +100,10 @@
                [The server didn't have enough of a given resource to
                 fulfill a given request.]
 
+        0x000A No such stream
+
+        0x000B No such circuit.
+
   The rest of the body should be a human-readable description of the error.
 
   In general, new error codes should only be added when they don't fall under
@@ -182,7 +186,7 @@
 
                 Status [1 octet]
                    (Sent connect=0,sent resolve=1,succeeded=2,failed=3,
-                    closed=4, new=5)
+                    closed=4, new connection=5, new resolve request=6)
                 Stream ID [4 octets]
                    (Must be unique to Tor process/time)
                 Target (NUL-terminated address-port string]
@@ -351,6 +355,9 @@
   associated with the specified circuit.  Each stream may be associated with
   at most one circuit, and multiple streams may share the same circuit.
 
+  If the circuit ID is 0, responsibility for attaching the given stream is
+  returned to Tor.
+
 3.16 POSTDESCRIPTOR (Type 0x000F)
 
   [Proposal; not finalized]