mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-26 07:31:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into master

Browse source
This commit is contained in:
Nick Mathewson 2020-11-17 10:53:39 -05:00
commit 3900b19379
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/ticket40195 Normal file
View file

@ -0,0 +1,5 @@
o Minor bugfixes (configuration, ports):
- Fix an issue where an ORPort was validated against other type of ports
when it should have been only checked against other ORPorts. This lead to
"DirPort auto" to be ignored and failing to be used. Fixes bug 40195;
bugfix on 0.4.5.1-alpha.

4
src/feature/relay/relay_config.c
View file

@ -227,6 +227,10 @@ remove_duplicate_orports(smartlist_t *ports)
if (removing[j]) { if (removing[j]) {
continue; continue;
} }
/* Skip non ORPorts. */
if (next->type != CONN_TYPE_OR_LISTENER) {
continue;
}
/* Same address family and same port number, we have a match. */ /* Same address family and same port number, we have a match. */
if (tor_addr_family(&current->addr) == tor_addr_family(&next->addr) && if (tor_addr_family(&current->addr) == tor_addr_family(&next->addr) &&
current->port == next->port) { current->port == next->port) {