[or-cvs] r13393: Fix or downgrade a few XXX020 items. (in tor/trunk: . doc/spec src/or)
nickm at seul.org
nickm at seul.org
Tue Feb 5 23:20:44 UTC 2008
Author: nickm
Date: 2008-02-05 18:20:44 -0500 (Tue, 05 Feb 2008)
New Revision: 13393
Modified:
tor/trunk/
tor/trunk/doc/spec/dir-spec.txt
tor/trunk/src/or/directory.c
tor/trunk/src/or/networkstatus.c
tor/trunk/src/or/routerlist.c
Log:
r17929 at catbus: nickm | 2008-02-05 17:10:26 -0500
Fix or downgrade a few XXX020 items.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r17929] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt 2008-02-05 21:39:56 UTC (rev 13392)
+++ tor/trunk/doc/spec/dir-spec.txt 2008-02-05 23:20:44 UTC (rev 13393)
@@ -945,8 +945,9 @@
protocol versioning system, and the protocol is "a version of the
Tor protocol more recent than any we recognize."
- Directory authorities SHOULD truncate version strings from
- descriptors so that "v" lines are no more than 128 characters long.
+ Directory authorities SHOULD omit version strings they receive from
+ descriptors if they would cause "v" lines to be over 128 characters
+ long.
The signature section contains the following item, which appears
Exactly Once for a vote, and At Least Once for a consensus.
@@ -1253,6 +1254,8 @@
http://<hostname>/tor/status-vote/current/consensus.z
and
http://<hostname>/tor/status-vote/current/consensus-signatures.z
+ [XXX current/consensus-signatures is not currently implemented, as it
+ is not used in the voting protocol.]
The other vote documents are analogously made available under
http://<hostname>/tor/status-vote/current/authority.z
Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c 2008-02-05 21:39:56 UTC (rev 13392)
+++ tor/trunk/src/or/directory.c 2008-02-05 23:20:44 UTC (rev 13393)
@@ -2346,8 +2346,9 @@
if ((item = dirvote_get_pending_consensus()))
smartlist_add(items, (char*)item);
} else if (!current && !strcmp(url, "consensus-signatures")) {
- /* XXXX020 the spec says that we should implement
- * current/consensus-signatures too. Why? -NM */
+ /* XXXX the spec says that we should implement
+ * current/consensus-signatures too. It doesn't seem to be needed,
+ * though. */
const char *item;
if ((item=dirvote_get_pending_detached_signatures()))
smartlist_add(items, (char*)item);
Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c 2008-02-05 21:39:56 UTC (rev 13392)
+++ tor/trunk/src/or/networkstatus.c 2008-02-05 23:20:44 UTC (rev 13393)
@@ -783,7 +783,7 @@
_compare_digest_to_routerstatus_entry);
}
-/*XXXX020 make this static once functions are moved into this file. */
+/*XXXX make this static once functions are moved into this file. */
/** DOCDOC */
int
networkstatus_vote_find_entry_idx(networkstatus_t *ns,
Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c 2008-02-05 21:39:56 UTC (rev 13392)
+++ tor/trunk/src/or/routerlist.c 2008-02-05 23:20:44 UTC (rev 13393)
@@ -633,12 +633,9 @@
log_warn(LD_FS, "We wrote some bytes to a new descriptor file at '%s',"
" but when we went to mmap it, it was empty!", fname);
} else if (had_any) {
- log_notice(LD_FS, "We just removed every descriptor in '%s'. This is "
- "okay if we're just starting up after a long time. "
- "Otherwise, it's a bug.",
- fname);
- /* XXX020 should we reduce the severity of the above log
- * message? I don't think we see it much in practice. -RD */
+ log_info(LD_FS, "We just removed every descriptor in '%s'. This is "
+ "okay if we're just starting up after a long time. "
+ "Otherwise, it's a bug.", fname);
}
} else {
log_warn(LD_FS, "Unable to mmap new descriptor file at '%s'.",fname);
@@ -1809,8 +1806,8 @@
) {
if (router_hex_digest_matches(router, nickname))
return router;
- else
- best_match = router; // XXXX020 NM not exactly right.
+ /* If we reach this point, we have a ID=name syntax that matches the
+ * identity but not the name. That isn't an acceptable match. */
}
});
@@ -2135,7 +2132,7 @@
}
addr_policy_list_free(router->exit_policy);
- /* XXXX020 Remove once 414/417 is fixed. But I have a hunch... */
+ /* XXXX Remove if this turns out to affect performance. */
memset(router, 77, sizeof(routerinfo_t));
tor_free(router);
@@ -2150,7 +2147,7 @@
tor_free(extrainfo->cache_info.signed_descriptor_body);
tor_free(extrainfo->pending_sig);
- /* XXXX020 remove this once more bugs go away. */
+ /* XXXX remove this if it turns out to slow us down. */
memset(extrainfo, 88, sizeof(extrainfo_t)); /* debug bad memory usage */
tor_free(extrainfo);
}
@@ -2161,7 +2158,7 @@
{
tor_free(sd->signed_descriptor_body);
- /* XXXX020 remove this once more bugs go away. */
+ /* XXXX remove this once more bugs go away. */
memset(sd, 99, sizeof(signed_descriptor_t)); /* Debug bad mem usage */
tor_free(sd);
}
@@ -2258,7 +2255,7 @@
{
routerinfo_t *ri_old;
{
- /* XXXX020 remove this code once bug 417/404 is fixed. */
+ /* XXXX Remove if this slows us down. */
routerinfo_t *ri_generated = router_get_my_routerinfo();
tor_assert(ri_generated != ri);
}
@@ -2293,7 +2290,7 @@
extrainfo_t *ei_tmp;
{
- /* XXXX020 remove this code once bug 417/404 is fixed. */
+ /* XXXX remove this code if it slows us down. */
extrainfo_t *ei_generated = router_get_my_extrainfo();
tor_assert(ei_generated != ei);
}
@@ -2339,7 +2336,7 @@
routerlist_insert_old(routerlist_t *rl, routerinfo_t *ri)
{
{
- /* XXXX020 remove this code once bug 417/404 is fixed. */
+ /* XXXX remove this code if it slows us down. */
routerinfo_t *ri_generated = router_get_my_routerinfo();
tor_assert(ri_generated != ri);
}
@@ -2436,7 +2433,7 @@
}
tor_assert(0 <= idx && idx < smartlist_len(rl->old_routers));
/* XXX020 edmanm's bridge relay triggered the following assert while
- * running 0.2.0.12-alpha: */
+ * running 0.2.0.12-alpha. */
tor_assert(smartlist_get(rl->old_routers, idx) == sd);
tor_assert(idx == sd->routerlist_index);
@@ -2486,7 +2483,7 @@
routerinfo_t *ri_tmp;
extrainfo_t *ei_tmp;
{
- /* XXXX020 remove this code once bug 417/404 is fixed. */
+ /* XXXX Remove this if it turns out to slow us down. */
routerinfo_t *ri_generated = router_get_my_routerinfo();
tor_assert(ri_generated != ri_new);
}
More information about the tor-commits
mailing list