[or-cvs] r17549: {tor} When a directory authority gives us a new guess for our IP a (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-12-09 20:46:51 -0500 (Tue, 09 Dec 2008)
New Revision: 17549

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
When a directory authority gives us a new guess for our IP address, 
log which authority we used. Hopefully this will help us debug
the recent complaints about bad IP address guesses.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-12-10 01:35:21 UTC (rev 17548)
+++ tor/trunk/ChangeLog	2008-12-10 01:46:51 UTC (rev 17549)
@@ -3,6 +3,9 @@
     - Give a better error message when an overzealous init script says,
       "sudo -u username tor --user username".  Makes Bug 882 easier
       for users to diagnose.
+    - When a directory authority gives us a new guess for our IP address,
+      log which authority we used. Hopefully this will help us debug
+      the recent complaints about bad IP address guesses.
 
   o Minor features (controller):
     - New CONSENSUS_ARRIVED event to note when a new consensus has

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2008-12-10 01:35:21 UTC (rev 17548)
+++ tor/trunk/src/or/router.c	2008-12-10 01:46:51 UTC (rev 17549)
@@ -1466,7 +1466,8 @@
 /** Note at log level severity that our best guess of address has changed from
  * <b>prev</b> to <b>cur</b>. */
 static void
-log_addr_has_changed(int severity, uint32_t prev, uint32_t cur)
+log_addr_has_changed(int severity, uint32_t prev, uint32_t cur,
+                     const char *source)
 {
   char addrbuf_prev[INET_NTOA_BUF_LEN];
   char addrbuf_cur[INET_NTOA_BUF_LEN];
@@ -1482,8 +1483,8 @@
   if (prev)
     log_fn(severity, LD_GENERAL,
            "Our IP Address has changed from %s to %s; "
-           "rebuilding descriptor.",
-           addrbuf_prev, addrbuf_cur);
+           "rebuilding descriptor (source: %s).",
+           addrbuf_prev, addrbuf_cur, source);
   else
     log_notice(LD_GENERAL,
              "Guessed our IP address as %s.",
@@ -1510,7 +1511,7 @@
   }
 
   if (prev != cur) {
-    log_addr_has_changed(LOG_INFO, prev, cur);
+    log_addr_has_changed(LOG_INFO, prev, cur, "resolve");
     ip_address_changed(0);
   }
 }
@@ -1570,7 +1571,8 @@
     control_event_server_status(LOG_NOTICE,
                                 "EXTERNAL_ADDRESS ADDRESS=%s METHOD=DIRSERV",
                                 suggestion);
-    log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr);
+    log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr,
+                         d_conn->_base.address);
     ip_address_changed(0);
     last_guessed_ip = addr; /* router_rebuild_descriptor() will fetch it */
   }