Stop trying to resolve our hostname so often

For example, we were doing a resolve every time we think about doing a
directory fetch. Now we reuse the cached answer in some cases.

Fixes bugs 1992 (bugfix on 0.2.0.20-rc) and 2410 (bugfix on
0.1.2.2-alpha).
This commit is contained in:
Roger Dingledine
2013-02-11 21:48:18 -05:00
parent cc896f7c84
commit 17089302fd
2 changed files with 8 additions and 2 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes:
- Stop trying to resolve our hostname so often (e.g. every time we
think about doing a directory fetch). Now we reuse the cached
answer in some cases. Fixes bugs 1992 (bugfix on 0.2.0.20-rc)
and 2410 (bugfix on 0.1.2.2-alpha).
+2 -2
View File
@@ -1712,7 +1712,7 @@ static int router_guess_address_from_dir_headers(uint32_t *guess);
int
router_pick_published_address(const or_options_t *options, uint32_t *addr)
{
if (resolve_my_address(LOG_INFO, options, addr, NULL, NULL, 0) < 0) {
if (resolve_my_address(LOG_INFO, options, addr, NULL, NULL, 1) < 0) {
log_info(LD_CONFIG, "Could not determine our address locally. "
"Checking if directory headers provide any hints.");
if (router_guess_address_from_dir_headers(addr) < 0) {
@@ -2159,7 +2159,7 @@ router_new_address_suggestion(const char *suggestion,
}
/* XXXX ipv6 */
if (resolve_my_address(LOG_INFO, options, &cur, NULL, NULL, 0) >= 0) {
if (resolve_my_address(LOG_INFO, options, &cur, NULL, NULL, 1) >= 0) {
/* We're all set -- we already know our address. Great. */
tor_addr_from_ipv4h(&last_guessed_ip, cur); /* store it in case we
need it later */