[or-cvs] r12323: Merge revised behavior on proposal 105 (in tor/trunk: . doc/spec/proposals)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-11-01 23:21:54 -0400 (Thu, 01 Nov 2007)
New Revision: 12323

Modified:
   tor/trunk/
   tor/trunk/doc/spec/proposals/105-handshake-revision.txt
Log:
 r14625@tombo:  nickm | 2007-11-01 23:21:25 -0400
 Merge revised behavior on proposal 105



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14625] on d9e39d38-0f13-419c-a857-e10a0ce2aa0c

Modified: tor/trunk/doc/spec/proposals/105-handshake-revision.txt
===================================================================
--- tor/trunk/doc/spec/proposals/105-handshake-revision.txt	2007-11-02 03:08:26 UTC (rev 12322)
+++ tor/trunk/doc/spec/proposals/105-handshake-revision.txt	2007-11-02 03:21:54 UTC (rev 12323)
@@ -193,9 +193,17 @@
    traffic through his own computers to enable timing and packet-counting
    attacks.
 
-   If a party connects to an OR based on an EXTEND cell, and the address
-   given in the EXTEND cell is not listed in the NETINFO cell, the first
-   party SHOULD close the connection as a likely MITM attack.
+   A Tor instance should use the other Tor's reported address
+   information as part of logic to decide whether to treat a given
+   connection as suitable for extending circuits to a given address/ID
+   combination.  When we get an extend request, we use an use an
+   existing OR connection if the ID matches, and ANY of the following
+   conditions hold:
+       - The IP matches the requested IP.
+       - We know that the IP we're using is canonical because it was
+         listed in the NETINFO cell.
+       - We know that the IP we're using is canonical because it was
+         listed in the server descriptor.
 
    [NOTE: The NETINFO cell is assigned the command number 8.]