From: Roger Dingledine Date: Thu, 19 Feb 2015 11:15:25 +0000 (-0500) Subject: don't update dir_info_status when we have minimum dir info X-Git-Tag: tor-0.2.6.3-alpha~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70f46f7ae6617ee99f5067a0f0e47eac2042eae1;p=thirdparty%2Ftor.git don't update dir_info_status when we have minimum dir info Nothing ever uses the string when we're in "have minimum dir info" state. The flow of the function is "check for problems, if you see a problem write an explanation to dir_info_status and set res to 0". If you get to the end of the function without any problems, then res = 1 and we're all ready to start making circuits. (Changed after consultation with Yawning.) --- diff --git a/src/or/nodelist.c b/src/or/nodelist.c index ab05bce420..29f00ac5d7 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1703,22 +1703,6 @@ update_router_have_minimum_dir_info(void) res = 0; control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); goto done; - } else { - /* these messages can be excessive in testing networks */ - static ratelim_t last_warned = - RATELIM_INIT(NOTICE_DIR_INFO_STATUS_INTERVAL); - char *suppression_msg = NULL; - - tor_snprintf(dir_info_status, sizeof(dir_info_status), - "We have enough %sdescriptors: we have %d/%d, and " - "can build %d%% of likely paths. (We have %s.)", - using_md?"micro":"", num_present, num_usable, - (int)(paths*100), status); - - if ((suppression_msg = rate_limit_log(&last_warned, time(NULL)))) { - log_info(LD_NET, "%s%s", dir_info_status, suppression_msg); - tor_free(suppression_msg); - } } tor_free(status);