commit 682a85ff7c691f691f9f7745e34e396f15e5d601 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 16:27:33 2011 -0500

Don't just tell the controller "foo" on id mismatch

Fixes bug 4169; bugfix on 0.2.1.1-alpha. --- changes/bug4169 | 6 ++++++ src/or/connection_or.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/changes/bug4169 b/changes/bug4169 new file mode 100644 index 0000000..38c18d3 --- /dev/null +++ b/changes/bug4169 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Report a real bootstrap problem to the controller on router + identity mismatch. Previously we just said "foo", which probably + made a lot of sense at the time. Fixes bug 4169; bugfix on + 0.2.1.1-alpha. + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 470f6d2..b865e13 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1514,7 +1514,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn, control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, END_OR_CONN_REASON_OR_IDENTITY); if (!authdir_mode_tests_reachability(options)) - control_event_bootstrap_problem("foo", END_OR_CONN_REASON_OR_IDENTITY); + control_event_bootstrap_problem( + "Unexpected identity in router certificate", + END_OR_CONN_REASON_OR_IDENTITY); as_expected = 0; } if (authdir_mode_tests_reachability(options)) {