mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-01 08:03:31 +01:00
actually, i think this fix was closest to what i originally
intended. this way we don't call resolve-my-address, which yells and screams if we're using an internal address (mere clients should not have to care). svn:r8998
This commit is contained in:
parent
116ae04c2d
commit
ab68e312bd
@ -1022,15 +1022,17 @@ router_new_address_suggestion(const char *suggestion)
|
|||||||
|
|
||||||
log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion);
|
log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion);
|
||||||
|
|
||||||
|
if (!server_mode(options)) {
|
||||||
|
last_guessed_ip = addr; /* store it in case we need it later */
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (resolve_my_address(LOG_INFO, options, &cur, NULL) >= 0) {
|
if (resolve_my_address(LOG_INFO, options, &cur, NULL) >= 0) {
|
||||||
/* We're all set -- we already know our address. Great. */
|
/* We're all set -- we already know our address. Great. */
|
||||||
last_guessed_ip = cur; /* store it in case we need it later */
|
last_guessed_ip = cur; /* store it in case we need it later */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!server_mode(options))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (last_guessed_ip != addr) {
|
if (last_guessed_ip != addr) {
|
||||||
log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr);
|
log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr);
|
||||||
server_has_changed_ip();
|
server_has_changed_ip();
|
||||||
|
Loading…
Reference in New Issue
Block a user