summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-17 12:38:37 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-17 12:38:37 +0000
commitdf9c8feac782c9feebad3a0fc7cc5eb7068bccf2 (patch)
treead090affe0b93f33441afeddda27990a33f32464 /src/or/circuituse.c
parentb5a7347db50ad76e8e1aaf6a6a88f733c202ca37 (diff)
downloadtor-df9c8feac782c9feebad3a0fc7cc5eb7068bccf2.tar.gz
tor-df9c8feac782c9feebad3a0fc7cc5eb7068bccf2.zip
Commit fixes for several pending tor core tasks: document all DOCDOCed functions; time out uncontrolled unattached streams; feed reasons to SOCKS5 (refactoring connection_ap_handshake_socks_reply in the process); change DirFetchPeriod/StatusFetchPeriod to have a special "Be smart" value.
svn:r3769
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 7eb5f597c4..c91680dc87 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -975,7 +975,9 @@ consider_recording_trackhost(connection_t *conn, circuit_t *circ) {
time(NULL) + options->TrackHostExitsExpire);
}
-/* DOCDOC. Return as for connection_ap_handshake_attach_chosen_circuit. */
+/** Attempt to attach the connection <b>conn</b> to <b>circ</b>, and
+ * send a begin or resolve cell as appropriate. Return values for
+ * connection_ap_handshake_attach_chosen_circuit. */
int
connection_ap_handshake_attach_chosen_circuit(connection_t *conn,
circuit_t *circ)