From: Roger Dingledine <arma@torproject.org>
Date: Sat, 27 Mar 2004 01:28:14 +0000 (+0000)
Subject: fix an assert trigger where an OP would fail to handshake, and we'd
X-Git-Tag: tor-0.0.5~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab5f3c067eb9b35aada9ee377927ca6b340c03b;p=thirdparty%2Ftor.git

fix an assert trigger where an OP would fail to handshake, and we'd
expect it to have a nickname.


svn:r1351
---

diff --git a/src/or/connection.c b/src/or/connection.c
index f78033b91e..c7f3867d04 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -187,7 +187,11 @@ _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) {
-        rep_hist_note_connect_failed(conn->nickname, time(NULL));
+        /* 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));
       } else {