diff options
| author | Jacob Appelbaum <jacob@appelbaum.net> | 2014-08-11 12:27:04 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2015-01-07 17:42:57 +0000 |
| commit | 8d59ddf3cba541c6578dff121e8f0623a7606bab (patch) | |
| tree | a85c724acac38346025042b128c60f20337dda05 /src/or/relay.c | |
| parent | 1abd526c75eade83318a6ec6aff84d5f0f079a3b (diff) | |
| download | tor-8d59ddf3cba541c6578dff121e8f0623a7606bab.tar.gz tor-8d59ddf3cba541c6578dff121e8f0623a7606bab.zip | |
Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.
Signed-off-by: Andrea Shepard <andrea@torproject.org>
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 2d11096309..b7ab8081e9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1327,8 +1327,9 @@ connection_edge_process_relay_cell_not_open( return 0; } - if ((family == AF_INET && ! entry_conn->ipv4_traffic_ok) || - (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok)) { + if (((family == AF_INET && ! entry_conn->ipv4_traffic_ok) || + (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok)) && + (!entry_conn->is_socks_socket)) { log_fn(LOG_PROTOCOL_WARN, LD_APP, "Got a connected cell to %s with unsupported address family." " Closing.", fmt_addr(&addr)); |