aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 4173e58189..f4ba1640ad 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1077,7 +1077,8 @@ static uint32_t last_guessed_ip = 0;
* If this address is different from the one we think we are now, and
* if our computer doesn't actually know its IP address, then switch. */
void
-router_new_address_suggestion(const char *suggestion)
+router_new_address_suggestion(const char *suggestion,
+ const dir_connection_t *conn)
{
uint32_t addr, cur = 0;
struct in_addr in;
@@ -1107,6 +1108,13 @@ router_new_address_suggestion(const char *suggestion)
/* Don't believe anybody who says our IP is, say, 127.0.0.1. */
return;
}
+ if (addr == conn->_base.addr) {
+ /* Don't believe anybody who says our IP is their IP. */
+ log_debug(LD_DIR, "A directory server told us our IP address is %s, "
+ "but he's just reporting his own IP address. Ignoring.",
+ suggestion);
+ return;
+ }
/* Okay. We can't resolve our own address, and X-Your-Address-Is is giving
* us an answer different from what we had the last time we managed to