Assert error introduced in r11957:

Fix an assert if we post a general-purpose descriptor via the
control port but that descriptor isn't mentioned in our current
network consensus. Bug reported by Jon McLachlan; bugfix on
0.2.0.9-alpha.

svn:r13153

diff --git a/ChangeLog b/ChangeLog
index 6cc17d1ac18514c50e90092de49d06a9595cfd74..7b34d541e380761fd72748362d1d0ab37f07eaf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,10 @@ Changes in version 0.2.0.16-alpha - 2008-01-??
     - Fix a small memory leak when setting up a hidden service.
     - Fix a few memory leaks that could in theory happen under bizarre error
       conditions.
+    - Fix an assert if we post a general-purpose descriptor via the
+      control port but that descriptor isn't mentioned in our current
+      network consensus. Bug reported by Jon McLachlan; bugfix on
+      0.2.0.9-alpha.
 
   o Minor features (controller):
     - Get NS events working again.  (Patch from tup)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5a16062f5e1cb8d56e6daddf391fd1bc3a18566d..7097cb64ddd0eeb530fb0fa0d32155d04a863512 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2721,6 +2721,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
       signed_desc_append_to_journal(&router->cache_info,
                                     &routerlist->desc_store);
     routerlist_insert_old(routerlist, router);
+    *msg = "Skipping router descriptor: not in consensus.";
     return -1;
   }