[or-cvs] [tor/maint-0.2.2] let unpublished bridges learn their ip address too

[arma@xxxxxxxxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Thu, 11 Nov 2010 11:26:42 -0500
Subject: let unpublished bridges learn their ip address too
Commit: 0a38358210df95f29fb7cfbb6ce67509b988ab4a

---
 changes/bug2050 |    5 +++++
 src/or/config.c |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changes/bug2050

diff --git a/changes/bug2050 b/changes/bug2050
new file mode 100644
index 0000000..3e45d34
--- /dev/null
+++ b/changes/bug2050
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Learn our external IP address when we're a relay or bridge, even if
+      we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha,
+      where we introduced bridge relays that don't need to publish to
+      be useful. Fixes bug 2050.
diff --git a/src/or/config.c b/src/or/config.c
index 7966557..70b99d7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2428,8 +2428,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
   }
 
   tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
-  if (is_internal_IP(ntohl(in.s_addr), 0) &&
-      options->_PublishServerDescriptor) {
+  if (is_internal_IP(ntohl(in.s_addr), 0)) {
     /* make sure we're ok with publishing an internal IP */
     if (!options->DirServers && !options->AlternateDirAuthority) {
       /* if they are using the default dirservers, disallow internal IPs
-- 
1.7.1