nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorder routerlist_assert_ok() and routerlist_check_bug_417(), so if the assert_ok triggers we know that our bug_417 is wrong

Browse Source 
svn:r10560
This commit is contained in:
Peter Palfrader 2007-06-11 19:46:23 +00:00
parent 932f2c79eb
commit e91cab20dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/routerlist.c
View File

@ -1903,10 +1903,10 @@ routerlist_insert(routerlist_t *rl, routerinfo_t *ri)
smartlist_add(rl->routers, ri); smartlist_add(rl->routers, ri);
ri->routerlist_index = smartlist_len(rl->routers) - 1; ri->routerlist_index = smartlist_len(rl->routers) - 1;
router_dir_info_changed(); router_dir_info_changed();
routerlist_check_bug_417();
#ifdef DEBUG_ROUTERLIST #ifdef DEBUG_ROUTERLIST
routerlist_assert_ok(rl); routerlist_assert_ok(rl);
#endif #endif
routerlist_check_bug_417();
} }
/** Adds the extrainfo_t <b>ei</b> to the routerlist <b>rl</b>, if there is a /** Adds the extrainfo_t <b>ei</b> to the routerlist <b>rl</b>, if there is a
@ -1961,10 +1961,10 @@ extrainfo_insert(routerlist_t *rl, extrainfo_t *ei)
if (r == 0) if (r == 0)
extrainfo_free(ei); extrainfo_free(ei);
routerlist_check_bug_417();
#ifdef DEBUG_ROUTERLIST #ifdef DEBUG_ROUTERLIST
routerlist_assert_ok(rl); routerlist_assert_ok(rl);
#endif #endif
routerlist_check_bug_417();
return r; return r;
} }
@ -1994,10 +1994,10 @@ routerlist_insert_old(routerlist_t *rl, routerinfo_t *ri)
} else { } else {
routerinfo_free(ri); routerinfo_free(ri);
} }
routerlist_check_bug_417();
#ifdef DEBUG_ROUTERLIST #ifdef DEBUG_ROUTERLIST
routerlist_assert_ok(rl); routerlist_assert_ok(rl);
#endif #endif
routerlist_check_bug_417();
} }
/** Remove an item <b>ri</b> from the routerlist <b>rl</b>, updating indices /** Remove an item <b>ri</b> from the routerlist <b>rl</b>, updating indices
@ -2052,10 +2052,10 @@ routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx, int make_old)
digestmap_remove(rl->desc_by_eid_map, ri->cache_info.extra_info_digest); digestmap_remove(rl->desc_by_eid_map, ri->cache_info.extra_info_digest);
routerinfo_free(ri); routerinfo_free(ri);
} }
routerlist_check_bug_417();
#ifdef DEBUG_ROUTERLIST #ifdef DEBUG_ROUTERLIST
routerlist_assert_ok(rl); routerlist_assert_ok(rl);
#endif #endif
routerlist_check_bug_417();
} }
/** Remove a signed_descriptor_t <b>sd</b> from <b>rl</b>-\>old_routers, and /** Remove a signed_descriptor_t <b>sd</b> from <b>rl</b>-\>old_routers, and
@ -2174,10 +2174,10 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old,
ri_old->cache_info.signed_descriptor_len; ri_old->cache_info.signed_descriptor_len;
routerinfo_free(ri_old); routerinfo_free(ri_old);
} }
routerlist_check_bug_417();
#ifdef DEBUG_ROUTERLIST #ifdef DEBUG_ROUTERLIST
routerlist_assert_ok(rl); routerlist_assert_ok(rl);
#endif #endif
routerlist_check_bug_417();
} }
/** Free all memory held by the routerlist module. */ /** Free all memory held by the routerlist module. */