diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-17 10:53:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-17 10:53:39 -0500 |
| commit | 3900b1937973141b5c75f7221162375f7a2e1f9c (patch) | |
| tree | 2455b840cb02d383aae0a47b7bd7f5bf0e22dddd /src/feature/relay | |
| parent | 7c06707750f549fc22b74bdba7b9743d7b536e19 (diff) | |
| parent | d04a27bed20cf44766fc30583c7a00108f42a09a (diff) | |
| download | tor-3900b1937973141b5c75f7221162375f7a2e1f9c.tar.gz tor-3900b1937973141b5c75f7221162375f7a2e1f9c.zip | |
Merge branch 'maint-0.4.5' into master
Diffstat (limited to 'src/feature/relay')
| -rw-r--r-- | src/feature/relay/relay_config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index ea03f43e13..e8c29fa7ed 100644 --- 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(¤t->addr) == tor_addr_family(&next->addr) && current->port == next->port) { |