diff options
| author | Andrea Shepard <andrea@torproject.org> | 2015-01-13 00:18:17 +0000 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2015-01-13 00:18:17 +0000 |
| commit | cb047f40786bf87f7fb17a500ca35eca9ba34f7c (patch) | |
| tree | 5f7304be80226964271d5545318305a381d654a2 /src/or/relay.c | |
| parent | f50068b17e77f9749fe798ef46124baa811d5b0a (diff) | |
| download | tor-cb047f40786bf87f7fb17a500ca35eca9ba34f7c.tar.gz tor-cb047f40786bf87f7fb17a500ca35eca9ba34f7c.zip | |
Fix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds for brokenness
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index b7ab8081e9..ac36e72b3b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1328,8 +1328,7 @@ connection_edge_process_relay_cell_not_open( } if (((family == AF_INET && ! entry_conn->ipv4_traffic_ok) || - (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok)) && - (!entry_conn->is_socks_socket)) { + (family == AF_INET6 && ! entry_conn->ipv6_traffic_ok))) { log_fn(LOG_PROTOCOL_WARN, LD_APP, "Got a connected cell to %s with unsupported address family." " Closing.", fmt_addr(&addr)); |