[or-cvs] Add TTLs to RESOLVED, CONNECTED, and END_REASON_EXITPOLICY ...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/doc
In directory moria:/tmp/cvs-serv6452/doc

Modified Files:
	tor-spec.txt 
Log Message:
Add TTLs to RESOLVED, CONNECTED, and END_REASON_EXITPOLICY cells.  Also, add a missing ntohl in connection_ap_handshake_socks_resolved.

Index: tor-spec.txt
===================================================================
RCS file: /home/or/cvsroot/tor/doc/tor-spec.txt,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- tor-spec.txt	19 Aug 2005 21:55:47 -0000	1.91
+++ tor-spec.txt	2 Sep 2005 18:53:31 -0000	1.92
@@ -469,8 +469,16 @@
    address cannot be resolved, or a connection can't be established, the
    exit node replies with a RELAY_END cell.  (See 5.4 below.)
    Otherwise, the exit node replies with a RELAY_CONNECTED cell, whose
-   payload is the 4-byte IPv4 address or the 16-byte IPv6 address to which
-   the connection was made.
+   payload is in one of the following formats:
+       The IPv4 address to which the connection was made [4 octets]
+       A number of seconds (TTL) for which the address may be cached [4 octets]
+    or
+       Four zero-valued octets [4 octets]
+       An address type (6)     [1 octet]
+       The IPv6 address to which the connection was made [16 octets]
+       A number of seconds (TTL) for which the address may be cached [4 octets]
+   [XXXX Versions of Tor before 0.1.1.6 ignore and do not generate the TTL
+   field.  No version of Tor currently generates the IPv6 format.]
 
    The OP waits for a RELAY_CONNECTED cell before sending any data.
    Once a connection has been established, the OP and exit node
@@ -511,7 +519,8 @@
                                    Tor protocol violations.)
 
    (With REASON_EXITPOLICY, the 4-byte IPv4 address or 16-byte IPv6 address
-   forms the optional data; no other reason currently has extra data.)
+   forms the optional data; no other reason currently has extra data.
+   As of 0.1.1.6, the body also contains a 4-byte TTL.)
 
    OPs and ORs MUST accept reasons not on the above list, since future
    versions of Tor may provide more fine-grained reasons.
@@ -558,6 +567,7 @@
        Type   (1 octet)
        Length (1 octet)
        Value  (variable-width)
+       TTL    (4 octets)
    "Length" is the length of the Value field.
    "Type" is one of:
       0x00 -- Hostname