summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 13:08:34 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 13:08:34 -0400
commit64748f2f987a28815f056dfe3a8a739f46d9157f (patch)
treedb9706608a26ac58d9fb073974263984ced6d37e
parent7d1eb0d57086c9630f7797916d9d2c948117a7e1 (diff)
downloadtor-64748f2f987a28815f056dfe3a8a739f46d9157f.tar.gz
tor-64748f2f987a28815f056dfe3a8a739f46d9157f.zip
Fix documentation for routerinfo_incompatible_with_extrainfo
-rw-r--r--src/or/routerlist.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2e347b0692..140fe218c3 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4896,13 +4896,21 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
return 1;
}
-/** Check whether <b>ri</b> (a.k.a. sd) is a router compatible with the
- * extrainfo document
- * <b>ei</b>. If no router is compatible with <b>ei</b>, <b>ei</b> should be
+/** Check whether <b>sd</b> describes a router descriptor compatible with the
+ * extrainfo document <b>ei</b>.
+ *
+ * <b>ri</b> (which must also be provided) is the full routerinfo corresponding
+ * to the same router -- but note that it might not refer to the same specific
+ * descriptor as sd.
+ *
+ * If no router is compatible with <b>ei</b>, <b>ei</b> should be
* dropped. Return 0 for "compatible", return 1 for "reject, and inform
* whoever uploaded <b>ei</b>, and return -1 for "reject silently.". If
* <b>msg</b> is present, set *<b>msg</b> to a description of the
* incompatibility (if any).
+ *
+ * Set the extrainfo_is_bogus field in <b>sd</b> if the digests matched
+ * but the extrainfo was nonetheless incompatible.
**/
int
routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,