diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-02-11 21:48:18 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-02-11 21:48:18 -0500 |
| commit | 17089302fdb454e03f173cc0c70c5a69c5c1cd7b (patch) | |
| tree | eecc79b0e5e855f856d981ea23ca32ec5eff471c | |
| parent | cc896f7c84c221d7dcfff1e0155533dce3ac5518 (diff) | |
| download | tor-17089302fdb454e03f173cc0c70c5a69c5c1cd7b.tar.gz tor-17089302fdb454e03f173cc0c70c5a69c5c1cd7b.zip | |
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).
| -rw-r--r-- | changes/bug1992 | 6 | ||||
| -rw-r--r-- | src/or/router.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug1992 b/changes/bug1992 new file mode 100644 index 0000000000..6fa4eaea09 --- /dev/null +++ b/changes/bug1992 @@ -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). + diff --git a/src/or/router.c b/src/or/router.c index bc1c6d215f..a668c24bed 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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 */ |