[or-cvs] r8998: actually, i think this fix was closest to what i originally (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-11-26 15:01:45 -0500 (Sun, 26 Nov 2006)
New Revision: 8998

Modified:
   tor/trunk/src/or/router.c
Log:
actually, i think this fix was closest to what i originally
intended. this way we don't call resolve-my-address, which
yells and screams if we're using an internal address (mere
clients should not have to care).


Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-11-26 19:22:25 UTC (rev 8997)
+++ tor/trunk/src/or/router.c	2006-11-26 20:01:45 UTC (rev 8998)
@@ -1022,15 +1022,17 @@
 
   log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion);
 
+  if (!server_mode(options)) {
+    last_guessed_ip = addr; /* store it in case we need it later */
+    return;
+  }
+
   if (resolve_my_address(LOG_INFO, options, &cur, NULL) >= 0) {
     /* We're all set -- we already know our address. Great. */
     last_guessed_ip = cur; /* store it in case we need it later */
     return;
   }
 
-  if (!server_mode(options))
-    return;
-
   if (last_guessed_ip != addr) {
     log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr);
     server_has_changed_ip();