Browse Source

log when we guess our ip address, not just when we fail

Roger Dingledine 13 years ago
parent
commit
6cb5383e56
2 changed files with 11 additions and 0 deletions
  1. 6 0
      changes/bug1534
  2. 5 0
      src/or/router.c

+ 6 - 0
changes/bug1534

@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - When we're trying to guess whether we know our IP address as
+      a relay, we would log various ways that we failed to guess
+      our address, but never log that we ended up guessing it
+      successfully. Now add a log line to help confused and anxious
+      relay operators. Bugfix on 0.1.2.1-alpha; fixes bug 1534.

+ 5 - 0
src/or/router.c

@@ -1257,6 +1257,8 @@ static int router_guess_address_from_dir_headers(uint32_t *guess);
 int
 router_pick_published_address(or_options_t *options, uint32_t *addr)
 {
+  char buf[INET_NTOA_BUF_LEN];
+  struct in_addr a;
   if (resolve_my_address(LOG_INFO, options, addr, NULL) < 0) {
     log_info(LD_CONFIG, "Could not determine our address locally. "
              "Checking if directory headers provide any hints.");
@@ -1266,6 +1268,9 @@ router_pick_published_address(or_options_t *options, uint32_t *addr)
       return -1;
     }
   }
+  a.s_addr = htonl(*addr);
+  tor_inet_ntoa(&a, buf, sizeof(buf));
+  log_info(LD_CONFIG,"Success: chose address '%s'.", buf);
   return 0;
 }