summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-12-02 17:35:05 +0000
committerRoger Dingledine <arma@torproject.org>2008-12-02 17:35:05 +0000
commit2d8f7a4ff63415568a30a20f3fbd067e9898b99b (patch)
treecdad3096aded3ab53c6453c4c4ff413f3ae225dc
parentb17b4f65b1b0875bae14ab765b95df27b6e6ba01 (diff)
downloadtor-2d8f7a4ff63415568a30a20f3fbd067e9898b99b.tar.gz
tor-2d8f7a4ff63415568a30a20f3fbd067e9898b99b.zip
clarify that 'resolve' relay cells nul-terminate the hostname, just
like 'begin' relay cells. svn:r17442
-rw-r--r--doc/spec/tor-spec.txt9
-rw-r--r--src/or/connection_edge.c3
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index e0a10a32d6..4603060478 100644
--- 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 97c995a340..9c4e7a3995 100644
--- 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