Patch from "Andrew S. Lists" to catch when we contact a directory mirror

at IP address X and he says we look like we're coming from IP address X.


svn:r13442

1 files changed, 9 insertions, 1 deletions

diff --git a/src/or/router.c b/src/or/router.c
index 6388d244e2..c74368ea88 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1464,7 +1464,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 *d_conn)
 {
   uint32_t addr, cur = 0;
   struct in_addr in;
@@ -1494,6 +1495,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 == d_conn->_base.addr) {
+    /* Don't believe anybody who says our IP is their IP. */
+    log_notice(LD_DIR, "A directory server told us our IP is %s, but that "
+              "seems to be the IP of the directory server saying these "
+              "things. 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