[or-cvs] r16577: {tor} And tell us more in another error case (tor/trunk/src/or)

[weasel at seul.org]

Author: weasel
Date: 2008-08-17 04:14:57 -0400 (Sun, 17 Aug 2008)
New Revision: 16577

Modified:
   tor/trunk/src/or/dirserv.c
Log:
And tell us more in another error case

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2008-08-17 08:11:21 UTC (rev 16576)
+++ tor/trunk/src/or/dirserv.c	2008-08-17 08:14:57 UTC (rev 16577)
@@ -1954,13 +1954,16 @@
                DIGEST_LEN)) {
       char rl_d[HEX_DIGEST_LEN+1];
       char rs_d[HEX_DIGEST_LEN+1];
+      char id[HEX_DIGEST_LEN+1];
 
       base16_encode(rl_d, sizeof(rl_d),
                     desc->cache_info.signed_descriptor_digest, DIGEST_LEN);
       base16_encode(rs_d, sizeof(rs_d), rs->descriptor_digest, DIGEST_LEN);
+      base16_encode(id, sizeof(id), rs->identity_digest, DIGEST_LEN);
       log_err(LD_BUG, "descriptor digest in routerlist does not match "
-                      "the one in routerstatus: %s vs %s\n",
-              rl_d, rs_d);
+                      "the one in routerstatus: %s vs %s "
+                      "(router %s)\n",
+              rl_d, rs_d, id);
 
       tor_assert(!memcmp(desc->cache_info.signed_descriptor_digest,
                        rs->descriptor_digest,