[or-cvs] r10561: Since desc_by_eid_map hold server descriptors, do not add ro (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-11 17:42:48 -0400 (Mon, 11 Jun 2007)
New Revision: 10561

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
 r13352 at catbus:  nickm | 2007-06-11 17:42:45 -0400
 Since desc_by_eid_map hold server descriptors, do not add routerinfo_ts.  Bug found by weasel



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-06-11 19:46:23 UTC (rev 10560)
+++ tor/trunk/ChangeLog	2007-06-11 21:42:48 UTC (rev 10561)
@@ -18,9 +18,13 @@
       controller connections on Unix domain sockets on systems that support
       them.  (Patch from Peter Palfrader.)
 
+  o Minor bugfixes (directory):
+    - Fix another crash bug related to extra-info caching.  (Bug found by
+      Peter Palfrader.) [Bugfix on 0.2.0.2-alpha]
+
   o Minor bugfixes (dns):
     - Fix a crash when DNSPort is set more than once. (Patch from Robert
-      Hogan.)
+      Hogan.) [Bugfix on 0.2.0.2-alpha]
 
   o Minor bugfixes (hidden services):
     - Stop tearing down the whole circuit when the user asks for a

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-06-11 19:46:23 UTC (rev 10560)
+++ tor/trunk/src/or/routerlist.c	2007-06-11 21:42:48 UTC (rev 10561)
@@ -2140,7 +2140,7 @@
 
   if (!tor_digest_is_zero(ri_new->cache_info.extra_info_digest)) {
     digestmap_set(rl->desc_by_eid_map, ri_new->cache_info.extra_info_digest,
-                  ri_new);
+                  &ri_new->cache_info);
   }
 
   if (make_old && get_options()->DirPort &&