tor

commit 3900b1937973141b5c75f7221162375f7a2e1f9c
parent 7c06707750f549fc22b74bdba7b9743d7b536e19
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 17 Nov 2020 10:53:39 -0500

Merge branch 'maint-0.4.5' into master

Diffstat:
A
changes/ticket40195
 | 
5
+++++
M
src/feature/relay/relay_config.c
 | 
4
++++

2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40195 b/changes/ticket40195
@@ -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.
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
@@ -227,6 +227,10 @@ remove_duplicate_orports(smartlist_t *ports)
       if (removing[j]) {
         continue;
       }
+      /* Skip non ORPorts. */
+      if (next->type != CONN_TYPE_OR_LISTENER) {
+        continue;
+      }
       /* Same address family and same port number, we have a match. */
       if (tor_addr_family(&current->addr) == tor_addr_family(&next->addr) &&
           current->port == next->port) {