[or-cvs] r10216: Yet more debugging code to track down 417/404, inspired by a (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-18 20:32:00 -0400 (Fri, 18 May 2007)
New Revision: 10216

Modified:
   tor/trunk/
   tor/trunk/src/or/routerlist.c
Log:
 r12798 at catbus:  nickm | 2007-05-18 20:31:54 -0400
 Yet more debugging code to track down 417/404, inspired by a fun core from arma.



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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-05-19 00:24:29 UTC (rev 10215)
+++ tor/trunk/src/or/routerlist.c	2007-05-19 00:32:00 UTC (rev 10216)
@@ -1738,6 +1738,12 @@
 {
   routerinfo_t *ri_old;
   routerlist_check_bug_417();
+  {
+    /* XXXX020 remove this code once bug 417/404 is fixed. */
+    routerinfo_t *ri_generated = router_get_my_routerinfo();
+    tor_assert(ri_generated != ri);
+  }
+
   ri_old = digestmap_set(rl->identity_map, ri->cache_info.identity_digest, ri);
   tor_assert(!ri_old);
   digestmap_set(rl->desc_digest_map, ri->cache_info.signed_descriptor_digest,
@@ -1805,6 +1811,11 @@
 routerlist_insert_old(routerlist_t *rl, routerinfo_t *ri)
 {
   routerlist_check_bug_417();
+  {
+    /* XXXX020 remove this code once bug 417/404 is fixed. */
+    routerinfo_t *ri_generated = router_get_my_routerinfo();
+    tor_assert(ri_generated != ri);
+  }
   if (get_options()->DirPort &&
       ri->purpose == ROUTER_PURPOSE_GENERAL &&
       !digestmap_get(rl->desc_digest_map,
@@ -1921,6 +1932,11 @@
   routerinfo_t *ri_tmp;
   extrainfo_t *ei_tmp;
   routerlist_check_bug_417();
+  {
+    /* XXXX020 remove this code once bug 417/404 is fixed. */
+    routerinfo_t *ri_generated = router_get_my_routerinfo();
+    tor_assert(ri_generated != ri_new);
+  }
   tor_assert(ri_old != ri_new);
   idx = _routerlist_find_elt(rl->routers, ri_old, idx);
   router_dir_info_changed();