clarify that 'resolve' relay cells nul-terminate the hostname, just

like 'begin' relay cells.

svn:r17442

diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index e0a10a32d692df67f617f4bcd12ef3f49574baac..46030604782fbf394f7471a8c030dcd61281bc9a 100644 (file)
--- a/doc/spec/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
@@ -858,10 +858,11 @@ see tor-design.pdf.
 6.4. Remote hostname lookup
 
    To find the address associated with a hostname, the OP sends a
-   RELAY_RESOLVE cell containing the hostname to be resolved.  (For a reverse
-   lookup, the OP sends a RELAY_RESOLVE cell containing an in-addr.arpa
-   address.)  The OR replies with a RELAY_RESOLVED cell containing a status
-   byte, and any number of answers.  Each answer is of the form:
+   RELAY_RESOLVE cell containing the hostname to be resolved with a nul
+   terminating byte. (For a reverse lookup, the OP sends a RELAY_RESOLVE
+   cell containing an in-addr.arpa address.) The OR replies with a
+   RELAY_RESOLVED cell containing a status byte, and any number of
+   answers. Each answer is of the form:
        Type   (1 octet)
        Length (1 octet)
        Value  (variable-width)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 97c995a340cd011fd7289ece0373c1cf291ded59..9c4e7a399595b6da9260361d0b009480f94b3a3a 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2630,7 +2630,8 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
 }
 
 /**
- * Called when we receive a RELAY_RESOLVE cell 'cell' along the circuit 'circ';
+ * Called when we receive a RELAY_COMMAND_RESOLVE cell 'cell' along the
+ * circuit <b>circ</b>;
  * begin resolving the hostname, and (eventually) reply with a RESOLVED cell.
  */
 int