[or-cvs] r13341: Correctly insert connections into the identity->connection m (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-01-30 17:23:44 -0500 (Wed, 30 Jan 2008)
New Revision: 13341

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_or.c
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17852] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-30 20:53:14 UTC (rev 13340)
+++ tor/trunk/ChangeLog	2008-01-30 22:23:44 UTC (rev 13341)
@@ -8,6 +8,9 @@
     - 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

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2008-01-30 20:53:14 UTC (rev 13340)
+++ tor/trunk/src/or/connection_or.c	2008-01-30 22:23:44 UTC (rev 13341)
@@ -748,7 +748,7 @@
   }
 
   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] = '$';