Commit 859d5a73 authored by teor's avatar teor
Browse files

Improve connection auth logging 

Improve the log message when connection initiators fail to authenticate
direct connections to relays.

Fixes bug 26927; bugfix on 0.3.0.1-alpha.
parent fdc3ad62

changes/bug26927

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (logging):

    - Improve the log message when connection initiators fail to authenticate

      direct connections to relays.

      Fixes bug 26927; bugfix on 0.3.0.1-alpha.

src/or/connection_or.c

+4 −4
Original line number Diff line number Diff line
@@ -1708,8 +1708,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, 
    }



    log_fn(severity, LD_HANDSHAKE,

           "Tried connecting to router at %s:%d, but RSA identity key was not "

           "as expected: wanted %s + %s but got %s + %s.%s",

           "Tried connecting to router at %s:%d, but RSA + ed25519 identity "

           "keys were not as expected: wanted %s + %s but got %s + %s.%s",

           conn->base_.address, conn->base_.port,

           expected_rsa, expected_ed, seen_rsa, seen_ed, extra_log);
@@ -1726,8 +1726,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, 
  }



  if (!expected_ed_key && ed_peer_id) {

    log_info(LD_HANDSHAKE, "(we had no Ed25519 ID in mind when we made this "

             "connection.");

    log_info(LD_HANDSHAKE, "(We had no Ed25519 ID in mind when we made this "

             "connection.)");

    connection_or_set_identity_digest(conn,

                                      (const char*)rsa_peer_id, ed_peer_id);

    changed_identity = 1;