diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-30 15:45:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-02 09:51:03 -0400 |
| commit | 81d312f12c196a87f6fb0a4ba7c445afe95b6d4a (patch) | |
| tree | 25abc676c57c29e922fb778d884f7fd7836364ab /src/core/or/connection_edge.c | |
| parent | 8f362b7bce5ebbba5c8d79cf10c5ec42bbde1519 (diff) | |
| download | tor-81d312f12c196a87f6fb0a4ba7c445afe95b6d4a.tar.gz tor-81d312f12c196a87f6fb0a4ba7c445afe95b6d4a.zip | |
Add a function for comparing the orport on an extendinfo.
Diffstat (limited to 'src/core/or/connection_edge.c')
| -rw-r--r-- | src/core/or/connection_edge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index fc77db8334..2826a99249 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -70,6 +70,7 @@ #include "core/or/circuitpadding.h" #include "core/or/connection_edge.h" #include "core/or/connection_or.h" +#include "core/or/extendinfo.h" #include "core/or/policies.h" #include "core/or/reasons.h" #include "core/or/relay.h" @@ -1444,8 +1445,8 @@ connection_ap_fail_onehop(const char *failed_digest, continue; } if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || - !tor_addr_eq(&build_state->chosen_exit->addr, &addr) || - build_state->chosen_exit->port != entry_conn->socks_request->port) + !extend_info_has_orport(build_state->chosen_exit, &addr, + entry_conn->socks_request->port)) continue; } log_info(LD_APP, "Closing one-hop stream to '%s/%s' because the OR conn " |