r17852@catbus: nickm | 2008-01-30 17:23:36 -0500

 Correctly insert connections into the identity->connection map when we connect to a bridge without having specified its key.  Fixes bug 574.

svn:r13341

diff --git a/ChangeLog b/ChangeLog
index 6d93eef1cc02eef6ab09424bcea887266de8208f..310b44ff8d825ac77c9a12cdbc38a41627c875a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ Changes in version 0.2.0.19-alpha - 2008-0?-??
     - Detect version of OSX where malloc_good_size is present in the
       library but never actually declared.  Resolves bug 587.  Bugfix
       on 0.2.0.x.
+    - When connecting to a bridge without specifying its key, insert
+      the connection into the identity-to-connection map as soon as
+      a key is learned.  Fixes bug 574.  Bugfix on 0.2.0.x.
 
 
 Changes in version 0.2.0.18-alpha - 2008-01-25

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 144d0acf5bb1bf51eb4c03498b4056cc077ea042..037d71364deaf9fb2597234d5a535e6935d25081 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -748,7 +748,7 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn,
   }
 
   if (started_here && tor_digest_is_zero(conn->identity_digest)) {
-    memcpy(conn->identity_digest, digest_rcvd_out, DIGEST_LEN);
+    connection_or_set_identity_digest(conn, digest_rcvd_out);
     tor_free(conn->nickname);
     conn->nickname = tor_malloc(HEX_DIGEST_LEN+2);
     conn->nickname[0] = '$';