diff options
author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-07-11 13:12:10 +1000 |
---|---|---|
committer | teor <teor2345@gmail.com> | 2016-08-31 13:41:31 +1000 |
commit | 16386a8cd15997acebdc1bd4ee047274b5c2730a (patch) | |
tree | 5633aeb478df3d7b038ff18da38ccdc482515938 /changes | |
parent | e3bf8854c81f46470d21f5e44cfa51b16e1d260b (diff) | |
download | tor-16386a8cd15997acebdc1bd4ee047274b5c2730a.tar.gz tor-16386a8cd15997acebdc1bd4ee047274b5c2730a.zip |
Count unix sockets when counting client listeners
Users can't run an anonymous client and non-anonymous single
onion service at the same time. We need to know whether we have
any client ports or sockets open to do this check.
When determining whether a client port (SOCKS, Trans, NATD, DNS)
is set, count unix sockets when counting client listeners. This
has no user-visible behaviour change, because these options are
set once and never read in the current tor codebase.
Don't count sockets when setting ControlPort_set, that's what
ControlSocket is for. (This will be reviewed in #19665.)
Don't count sockets when counting server listeners, because the code
that uses these options expects to count externally-visible ports.
(And it would change the behaviour of Tor.)
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug19677 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug19677 b/changes/bug19677 new file mode 100644 index 0000000000..e8ba3dd61a --- /dev/null +++ b/changes/bug19677 @@ -0,0 +1,6 @@ + o Minor bug fixes (option parsing): + - Count unix sockets when counting client listeners (SOCKS, Trans, + NATD, and DNS). This has no user-visible behaviour changes: these + options are set once, and never read. + Required for correct behaviour in ticket #17178. + Fixes bug #19677, patch by teor. |