cleanups on r13442.

oh, and this should be backported too.


svn:r13444

ChangeLog

@@ -30,6 +30,9 @@ Changes in version 0.2.0.19-alpha - 2008-02-??
     - If we're a relay, avoid picking ourselves as an introduction point,
       a rendezvous point, or as the final hop for internal circuits. Bug
       reported by taranis and lodger. Bugfix on 0.1.2.x.
+    - 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. Bugfix on 0.1.2.x.
 
   o Minor bugfixes:
     - Directory caches now fetch certificates from all authorities

src/or/or.h

@@ -3779,8 +3779,8 @@ void mark_my_descriptor_dirty_if_older_than(time_t when);
 void mark_my_descriptor_dirty(void);
 void check_descriptor_bandwidth_changed(time_t now);
 void check_descriptor_ipaddress_changed(time_t now);
-void router_new_address_suggestion(const char *suggestion, 
-				   const dir_connection_t *d_conn);
+void router_new_address_suggestion(const char *suggestion,
+                                   const dir_connection_t *d_conn);
 int router_compare_to_my_exit_policy(edge_connection_t *conn);
 routerinfo_t *router_get_my_routerinfo(void);
 extrainfo_t *router_get_my_extrainfo(void);

src/or/router.c

@@ -1460,12 +1460,13 @@ check_descriptor_ipaddress_changed(time_t now)
  * headers. */
 static uint32_t last_guessed_ip = 0;
 
-/** A directory server told us our IP address is <b>suggestion</b>.
+/** A directory server <b>d_conn</b> told us our IP address is
+ * <b>suggestion</b>.
  * 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, 
-			      const dir_connection_t *d_conn)
+router_new_address_suggestion(const char *suggestion,
+                              const dir_connection_t *d_conn)
 {
   uint32_t addr, cur = 0;
   struct in_addr in;
@@ -1497,9 +1498,9 @@ router_new_address_suggestion(const char *suggestion,
   }
   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);
+    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;
   }