[or-cvs] r11499: Start using the v2 intro format for hidden service connectio (in tor/trunk: . doc/spec src/or)

[arma at seul.org]

Author: arma
Date: 2007-09-18 19:48:39 -0400 (Tue, 18 Sep 2007)
New Revision: 11499

Modified:
   tor/trunk/ChangeLog
   tor/trunk/doc/spec/rend-spec.txt
   tor/trunk/src/or/rendcommon.c
Log:
Start using the v2 intro format for hidden service connections. Now
clients specify their chosen rendezvous point by identity digest
rather than by (potentially ambiguous) nickname. This change could
speed up hidden service connections dramatically.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-09-18 23:34:27 UTC (rev 11498)
+++ tor/trunk/ChangeLog	2007-09-18 23:48:39 UTC (rev 11499)
@@ -34,6 +34,10 @@
   o Major bugfixes:
     - Fix possible segfaults in functions called from
       rend_process_relay_cell().
+    - Start using the v2 intro format for hidden service connections. Now
+      clients specify their chosen rendezvous point by identity digest
+      rather than by (potentially ambiguous) nickname. This change could
+      speed up hidden service connections dramatically.
 
   o Minor bugfixes:
     - When generating information telling us how to extend to a given

Modified: tor/trunk/doc/spec/rend-spec.txt
===================================================================
--- tor/trunk/doc/spec/rend-spec.txt	2007-09-18 23:34:27 UTC (rev 11498)
+++ tor/trunk/doc/spec/rend-spec.txt	2007-09-18 23:48:39 UTC (rev 11499)
@@ -361,9 +361,10 @@
    20+42+16+20+20+128=246 bytes, and the version 1 and version 2
    introduction formats have other sizes.
 
-   As of Tor 0.2.0.6-alpha, clients only generate the v0 introduction
-   format, whereas hidden services have understoodd and accepted v0,
-   v1, and v2 since 0.1.1.x.
+   Through Tor 0.2.0.6-alpha, clients only generated the v0 introduction
+   format, whereas hidden services have understood and accepted v0,
+   v1, and v2 since 0.1.1.x. As of Tor 0.2.0.7-alpha, clients switched
+   to using the v2 intro format.
 
 1.8.1. Other introduction formats we don't use.
 

Modified: tor/trunk/src/or/rendcommon.c
===================================================================
--- tor/trunk/src/or/rendcommon.c	2007-09-18 23:34:27 UTC (rev 11498)
+++ tor/trunk/src/or/rendcommon.c	2007-09-18 23:48:39 UTC (rev 11499)
@@ -109,7 +109,7 @@
   if (end-cp < 4) goto truncated;
   result->timestamp = (time_t) ntohl(get_uint32(cp));
   cp += 4;
-  result->protocols = 1;
+  result->protocols = 1<<2; /* always use intro format 2 */
   if (end-cp < 2) goto truncated;
   result->n_intro_points = ntohs(get_uint16(cp));
   cp += 2;