[or-cvs] r11992: Correct mismatches between DirServer lines and authority con (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-10-16 13:22:37 -0400 (Tue, 16 Oct 2007)
New Revision: 11992

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
 r15862@catbus:  nickm | 2007-10-16 13:19:29 -0400
 Correct mismatches between DirServer lines and authority configuration.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-16 17:21:05 UTC (rev 11991)
+++ tor/trunk/ChangeLog	2007-10-16 17:22:37 UTC (rev 11992)
@@ -26,6 +26,9 @@
     - Correctly check for bad options to the "PublishServerDescriptor"
       config option. Bugfix on 0.2.0.1-alpha; reported by Matt Edman.
     - When we discard a vote as a duplicate, do not report this as an error.
+    - When we're configured to be a v3 authority, but we're only listed
+      as a non-v3 authority in our DirServer line for ourself, correct the
+      listing.
 
   o Minor bugfixes (memory leaks):
     - Stop leaking memory on failing case of base32_decode.  Bugfix on

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-10-16 17:21:05 UTC (rev 11991)
+++ tor/trunk/src/or/router.c	2007-10-16 17:22:37 UTC (rev 11992)
@@ -384,6 +384,8 @@
   or_options_t *options = get_options();
   authority_type_t type;
   time_t now = time(NULL);
+  trusted_dir_server_t *ds;
+  int v3_digest_set = 0;
 
   if (!key_lock)
     key_lock = tor_mutex_new();
@@ -423,6 +425,7 @@
     if (get_my_v3_authority_cert()) {
       crypto_pk_get_digest(get_my_v3_authority_cert()->identity_key,
                            v3_digest);
+      v3_digest_set = 1;
     }
   }
 
@@ -550,6 +553,21 @@
                            v3_digest,
                            type);
   }
+  if ((ds = router_get_trusteddirserver_by_digest(digest))) {
+    if (ds->type != type) {
+      log_warn(LD_DIR,  "Configured authority type does not match authority "
+               "type in DirServer list.  Adjusting. (%d v %d)",
+               type, ds->type);
+      ds->type = type;
+    }
+    if (v3_digest_set && (ds->type & V3_AUTHORITY) &&
+        memcmp(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) {
+      log_warn(LD_DIR, "V3 identity key does not match identity declared in "
+               "DirServer line.  Adjusting.");
+      memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN);
+    }
+  }
+
   return 0; /* success */
 }