[or-cvs] r14968: remove some networkstatus consensus warnings for unnamed / i (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-06-05 04:20:23 -0400 (Thu, 05 Jun 2008)
New Revision: 14968

Modified:
   tor/trunk/src/or/networkstatus.c
Log:
remove some networkstatus consensus warnings for unnamed / invalid
relays. they weren't very specific, and were confusing people before
we reduced their log severity. now nobody even knows they exist.


Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2008-06-05 06:27:58 UTC (rev 14967)
+++ tor/trunk/src/or/networkstatus.c	2008-06-05 08:20:23 UTC (rev 14968)
@@ -55,9 +55,6 @@
 /** Download status for the current consensus networkstatus. */
 static download_status_t consensus_dl_status = { 0, 0, DL_SCHED_CONSENSUS };
 
-/** True iff we have logged a warning about this OR not being valid or
- * not being named. */
-static int have_warned_about_invalid_status = 0;
 /** True iff we have logged a warning about this OR's version being older than
  * listed by the authorities. */
 static int have_warned_about_old_version = 0;
@@ -79,7 +76,6 @@
                       rs->name_lookup_warned = 0);
   }
 
-  have_warned_about_invalid_status = 0;
   have_warned_about_old_version = 0;
   have_warned_about_new_version = 0;
 }
@@ -1533,10 +1529,8 @@
 void
 routers_update_all_from_networkstatus(time_t now, int dir_version)
 {
-  routerinfo_t *me;
   routerlist_t *rl = router_get_routerlist();
   networkstatus_t *consensus = networkstatus_get_live_consensus(now);
-  or_options_t *options = get_options();
 
   if (networkstatus_v2_list_has_changed)
     download_status_map_update_from_v2_networkstatus();
@@ -1554,29 +1548,6 @@
   if (rl->old_routers)
     signed_descs_update_status_from_consensus_networkstatus(rl->old_routers);
 
-  /* XXX020 these warnings don't help anymore; we should disable them -RD */
-  me = router_get_my_routerinfo();
-  if (me && !have_warned_about_invalid_status) {
-    routerstatus_t *rs = networkstatus_vote_find_entry(consensus,
-                                        me->cache_info.identity_digest);
-
-    if (!rs) {
-      log_info(LD_GENERAL, "The latest consensus does not list us."
-               "Are you misconfigured?");
-      have_warned_about_invalid_status = 1;
-    } else if (rs->is_unnamed) {
-      /* Maybe upgrade this to notice? XXXX020 */
-      log_info(LD_GENERAL,  "The directory have assigned the nickname "
-               "you're using (%s) to a different identity; you may want to "
-               "choose a different nickname.", options->Nickname);
-      have_warned_about_invalid_status = 1;
-    } else if (!rs->is_named) {
-      log_debug(LD_GENERAL, "The directory authorities do not currently "
-                "recognize your nickname.");
-      have_warned_about_invalid_status = 1;
-    }
-  }
-
   if (!have_warned_about_old_version) {
     int is_server = server_mode(get_options());
     version_status_t status;