[or-cvs] r11839: Resolve/ignore some XXXXs, and be even more careful about li (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-10 15:33:11 -0400 (Wed, 10 Oct 2007)
New Revision: 11839

Modified:
   tor/trunk/
   tor/trunk/src/or/dirvote.c
Log:
 r15634 at catbus:  nickm | 2007-10-10 14:26:49 -0400
 Resolve/ignore some XXXXs, and be even more careful about listing a server as a v3 authority.



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

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-10-10 19:33:06 UTC (rev 11838)
+++ tor/trunk/src/or/dirvote.c	2007-10-10 19:33:11 UTC (rev 11839)
@@ -1310,7 +1310,8 @@
   }
 }
 
-/* XXXX020 delete me. */
+/** Return a newly allocated string containing the hex-encoded v3 authority
+    identity digest of every recognized v3 authority. */
 static char *
 list_v3_auth_ids(void)
 {
@@ -1318,9 +1319,10 @@
   char *keys;
   SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
                     trusted_dir_server_t *, ds,
-       if (!tor_digest_is_zero(ds->v3_identity_digest))
-         smartlist_add(known_v3_keys,
-              tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN))));
+    if ((ds->type & V3_AUTHORITY) &&
+        !tor_digest_is_zero(ds->v3_identity_digest))
+      smartlist_add(known_v3_keys,
+                    tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN))));
   keys = smartlist_join_strings(known_v3_keys, ", ", 0, NULL);
   SMARTLIST_FOREACH(known_v3_keys, char *, cp, tor_free(cp));
   smartlist_free(known_v3_keys);
@@ -1610,7 +1612,6 @@
                                             sigs);
 
   if (r >= 0) {
-    /* XXXX This should really be its own function. */
     char *new_detached =
       networkstatus_get_detached_signatures(pending_consensus);
     const char *src;