nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2013-08-25 00:29:49 -04:00
commit 1ee1c8fb4f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug9366 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (usability):
- Warn and fail if a server is configured not to advertise any
ORPorts at all. (We need *something* to put in our descriptor, or
we just won't work.)

7
src/or/config.c
View File

@ -5519,6 +5519,13 @@ check_server_ports(const smartlist_t *ports,
"listening on one.");
r = -1;
}
if (n_orport_listeners && !n_orport_advertised) {
log_warn(LD_CONFIG, "We are listening on an ORPort, but not advertising "
"any ORPorts. This will keep us from building a %s "
"descriptor, and make us impossible to use.",
options->BridgeRelay ? "bridge" : "router");
r = -1;
}
if (n_dirport_advertised && !n_dirport_listeners) {
log_warn(LD_CONFIG, "We are advertising a DirPort, but not actually "
"listening on one.");