let unpublished bridges learn their ip address too

This commit is contained in:
Roger Dingledine 2010-11-11 11:26:42 -05:00
parent 2a50dd9359
commit 0a38358210
2 changed files with 6 additions and 2 deletions

5
changes/bug2050 Normal file
View File

@ -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.

View File

@ -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