|
@@ -714,7 +714,8 @@ connection_or_about_to_close(or_connection_t *or_conn)
|
|
reason);
|
|
reason);
|
|
if (!authdir_mode_tests_reachability(options))
|
|
if (!authdir_mode_tests_reachability(options))
|
|
control_event_bootstrap_problem(
|
|
control_event_bootstrap_problem(
|
|
- orconn_end_reason_to_control_string(reason), reason);
|
|
|
|
|
|
+ orconn_end_reason_to_control_string(reason),
|
|
|
|
+ reason, or_conn);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else if (conn->hold_open_until_flushed) {
|
|
} else if (conn->hold_open_until_flushed) {
|
|
@@ -1077,7 +1078,7 @@ connection_or_connect_failed(or_connection_t *conn,
|
|
{
|
|
{
|
|
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, reason);
|
|
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, reason);
|
|
if (!authdir_mode_tests_reachability(get_options()))
|
|
if (!authdir_mode_tests_reachability(get_options()))
|
|
- control_event_bootstrap_problem(msg, reason);
|
|
|
|
|
|
+ control_event_bootstrap_problem(msg, reason, conn);
|
|
}
|
|
}
|
|
|
|
|
|
/** <b>conn</b> got an error in connection_handle_read_impl() or
|
|
/** <b>conn</b> got an error in connection_handle_read_impl() or
|
|
@@ -1708,7 +1709,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
|
|
if (!authdir_mode_tests_reachability(options))
|
|
if (!authdir_mode_tests_reachability(options))
|
|
control_event_bootstrap_problem(
|
|
control_event_bootstrap_problem(
|
|
"Unexpected identity in router certificate",
|
|
"Unexpected identity in router certificate",
|
|
- END_OR_CONN_REASON_OR_IDENTITY);
|
|
|
|
|
|
+ END_OR_CONN_REASON_OR_IDENTITY,
|
|
|
|
+ conn);
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
if (authdir_mode_tests_reachability(options)) {
|
|
if (authdir_mode_tests_reachability(options)) {
|