From: Roger Dingledine <arma@torproject.org>
Date: Thu, 11 Nov 2010 16:26:42 +0000 (-0500)
Subject: let unpublished bridges learn their ip address too
X-Git-Tag: tor-0.2.2.18-alpha~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a38358210df95f29fb7cfbb6ce67509b988ab4a;p=thirdparty%2Ftor.git

let unpublished bridges learn their ip address too
---

diff --git a/changes/bug2050 b/changes/bug2050
new file mode 100644
index 0000000000..3e45d3463f
--- /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 7966557063..70b99d7554 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