[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Make it compile. appease roger and his thirst for documenta...
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv21420
Modified Files:
routerlist.c
Log Message:
Make it compile. appease roger and his thirst for documentation.
Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- routerlist.c 19 Oct 2005 03:02:28 -0000 1.347
+++ routerlist.c 19 Oct 2005 03:08:50 -0000 1.348
@@ -1115,7 +1115,7 @@
* as needed. If <b>idx</b> is nonnegative and smartlist_get(rl->routers,
* idx) == ri, we don't need to do a linear search over the list to decide
* which to remove. We fill the gap rl->routers with a later element in
- * the list, if any exists. */
+ * the list, if any exists. ri_old is not freed.*/
void
routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx)
{
@@ -1136,6 +1136,11 @@
// routerlist_assert_ok(rl);
}
+/** Remove <b>ri_old</b> from the routerlist <b>rl</b>, and replace it with
+ * <b>ri_new</b>, updating all index info. If <b>idx</b> is nonnegative and
+ * smartlist_get(rl->routers, idx) == ri, we don't need to do a linear
+ * search over the list to decide which to remove. We put ri_new in the same
+ * index as ri_old, if possible. ri_old is not freed.*/
static void
routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old,
routerinfo_t *ri_new, int idx)
@@ -1153,7 +1158,7 @@
} else {
smartlist_add(rl->routers, ri_new);
}
- if (memcmp(ri_old->identity_digest, ri->new_identity_digest)) {
+ if (memcmp(ri_old->identity_digest, ri_new->identity_digest, DIGEST_LEN)) {
/* digests don't match; digestmap_set won't replace */
digestmap_remove(rl->identity_map, ri_old->identity_digest);
}