nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't build descriptors if ORPort auto is set and we have no OR listener

Browse Source 
This situation can happen easily if you set 'ORPort auto' and
'AccountingMax'.  Doing so means that when you have no ORPort, you
won't be able to set an ORPort in a descriptor, so instead you would
just generate lots of invalid descriptors, freaking out all the time.

Possible fix for 3216; fix on 0.2.2.26-beta.
This commit is contained in:
Nick Mathewson 2011-05-17 21:42:35 -04:00 committed by Sebastian Hahn
parent 6cac100b13
commit 95ac3ea594
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug3216 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- Don't try to build descriptors if "ORPort auto" is set and we
don't know our actual ORPort yet. Fix for bug 3216; bugfix on
0.2.2.26-beta.

4
src/or/router.c
View File

@ -802,6 +802,8 @@ decide_to_advertise_dirport(or_options_t *options, uint16_t dir_port)
return 0;
if (!check_whether_dirport_reachable())
return 0;
if (!router_get_advertised_dir_port(options))
return 0;
/* Section two: reasons to publish or not publish that the user
* might find surprising. These are generally config options that
@ -1136,6 +1138,8 @@ decide_if_publishable_server(void)
return 0;
if (authdir_mode(options))
return 1;
if (!router_get_advertised_or_port(options))
return 0;
return check_whether_orport_reachable();
}