aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-29 14:31:24 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:06:19 -0500
commitf4e64c04f49a3cd8c9b2289bd28641db85441acc (patch)
tree82a1b9fa5934e260c590bc6d7b0f6baf8e67dfa1 /src/or/connection_or.c
parent6c3f555a8c4d33b8f9dcdc55c03bee8170feb65f (diff)
downloadtor-f4e64c04f49a3cd8c9b2289bd28641db85441acc.tar.gz
tor-f4e64c04f49a3cd8c9b2289bd28641db85441acc.zip
Remove some resolved "XXXX prop271" comments.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 14d597960e..3b6f82c904 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -735,8 +735,9 @@ connection_or_about_to_close(or_connection_t *or_conn)
const or_options_t *options = get_options();
connection_or_note_state_when_broken(or_conn);
rep_hist_note_connect_failed(or_conn->identity_digest, now);
+ /* Tell the new guard API about the channel failure */
entry_guard_chan_failed(TLS_CHAN_TO_BASE(or_conn->chan));
- /* XXXX prop271 -- old API */
+ /* Tell the old guard API about the channel failure */
entry_guard_register_connect_status(or_conn->identity_digest,0,
!options->HTTPSProxy, now);
if (conn->state >= OR_CONN_STATE_TLS_HANDSHAKING) {
@@ -1675,8 +1676,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
"Tried connecting to router at %s:%d, but identity key was not "
"as expected: wanted %s but got %s.%s",
conn->base_.address, conn->base_.port, expected, seen, extra_log);
+ /* Tell the new guard API about the channel failure */
entry_guard_chan_failed(TLS_CHAN_TO_BASE(conn->chan));
- /* XXXX prop271 old API */
+ /* Tell the old guard API about the channel failure */
entry_guard_register_connect_status(conn->identity_digest, 0, 1,
time(NULL));
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED,