summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-02-08 21:13:15 +0000
committerNick Mathewson <nickm@torproject.org>2008-02-08 21:13:15 +0000
commit141a5877f3dad587e3af16a1e589a668fc227a41 (patch)
tree4266c24380dbfbfd0bedddb131c8f71c7668c778 /src/or/connection_edge.c
parentde827f89df460e5920239a14addd1dd264b76bb5 (diff)
downloadtor-141a5877f3dad587e3af16a1e589a668fc227a41.tar.gz
tor-141a5877f3dad587e3af16a1e589a668fc227a41.zip
r14063@tombo: nickm | 2008-02-08 15:48:32 -0500
Add a bunch more code documentation; change the interface of fetch_var_cell_from_buf() so it takes the current link protocol into account and can't get confused by weird command bytes on v1 connections. svn:r13430
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index c3bb69ec12..8f38b615f9 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1994,8 +1994,6 @@ connection_ap_handshake_send_resolve(edge_connection_t *ap_conn)
* and call connection_ap_handshake_attach_circuit(conn) on it.
*
* Return the other end of the linked connection pair, or -1 if error.
- *
- * DOCDOC start_reading
*/
edge_connection_t *
connection_ap_make_link(char *address, uint16_t port,
@@ -2051,7 +2049,9 @@ connection_ap_make_link(char *address, uint16_t port,
return conn;
}
-/** DOCDOC */
+/** Notify any interested controller connections about a new hostname resolve
+ * or resolve error. Takes the same arguments as does
+ * connection_ap_handshake_socks_resolved(). */
static void
tell_controller_about_resolved_result(edge_connection_t *conn,
int answer_type,
@@ -2088,7 +2088,7 @@ tell_controller_about_resolved_result(edge_connection_t *conn,
* via SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or
* -1 for unreachable; the answer should be in the format specified
* in the socks extensions document.
- * DOCDOC expires
+ * DOCDOC ttl expires
**/
void
connection_ap_handshake_socks_resolved(edge_connection_t *conn,