nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/minor-comments'

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-19 08:24:49 -04:00
commit 84d587bed8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/connection.c
View File

@ -812,7 +812,7 @@ connection_mark_for_close_(connection_t *conn, int line, const char *file)
* CONN_TYPE_OR checks; this should be called when you either are sure that
* if this is an or_connection_t the controlling channel has been notified
* (e.g. with connection_or_notify_error()), or you actually are the
* connection_or_close_for_error() or connection_or_close_normally function.
* connection_or_close_for_error() or connection_or_close_normally() function.
* For all other cases, use connection_mark_and_flush() instead, which
* checks for or_connection_t properly, instead. See below.
*/

7
src/or/connection_or.c
View File

@ -1743,8 +1743,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
return 0;
}
/** Return when a client used this, for connection.c, since client_used
* is now one of the timestamps of channel_t */
/** Return when we last used this channel for client activity (origin
* circuits). This is called from connection.c, since client_used is now one
* of the timestamps in channel_t */
time_t
connection_or_client_used(or_connection_t *conn)
@ -1758,7 +1759,7 @@ connection_or_client_used(or_connection_t *conn)
/** The v1/v2 TLS handshake is finished.
*
* Make sure we are happy with the person we just handshaked with.
* Make sure we are happy with the peer we just handshaked with.
*
* If they initiated the connection, make sure they're not already connected,
* then initialize conn from the information in router.