[or-cvs] r8997: Actually, clients *should* try to guess their addresses. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-11-26 14:22:25 -0500 (Sun, 26 Nov 2006)
New Revision: 8997

Modified:
   tor/trunk/
   tor/trunk/src/or/router.c
Log:
 r9399@totoro:  nickm | 2006-11-26 14:22:17 -0500
 Actually, clients *should* try to guess their addresses.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9399] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-11-26 18:36:51 UTC (rev 8996)
+++ tor/trunk/src/or/router.c	2006-11-26 19:22:25 UTC (rev 8997)
@@ -1022,15 +1022,15 @@
 
   log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion);
 
-  if (!server_mode(options))
-    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();