Commit 9ab5f3c0 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

fix an assert trigger where an OP would fail to handshake, and we'd 

expect it to have a nickname.


svn:r1351
parent 47b40de0

src/or/connection.c

+4 −0
Changes for src/or/connection.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ _connection_mark_for_close(connection_t *conn, char reason) 
    case CONN_TYPE_OR:

      /* Remember why we're closing this connection. */

      if (conn->state != OR_CONN_STATE_OPEN) {

        /* XXX Nick: this still isn't right, because it might be

         * dying even though we didn't initiate the connect. Can

         * you look at this more? -RD */

        if(conn->nickname)

          rep_hist_note_connect_failed(conn->nickname, time(NULL));

      } else if (reason == CLOSE_REASON_UNUSED_OR_CONN) {

        rep_hist_note_disconnect(conn->nickname, time(NULL));