diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2017-11-03 23:00:27 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2017-11-04 18:30:59 +0100 |
| commit | 5a46074e550229e6c19eac9625b26af346b487fc (patch) | |
| tree | c6d062a54ed45e0fb2f35c128d328a5e4555350a /src/or/relay.c | |
| parent | 0386280487fce78b73e060234f515b850af9c589 (diff) | |
| download | tor-5a46074e550229e6c19eac9625b26af346b487fc.tar.gz tor-5a46074e550229e6c19eac9625b26af346b487fc.zip | |
Revert "Make ClientDNSRejectInternalAddresses testing-only."
This reverts commit 27fa4a98d23972213122fa99499efa4baebe49e3.
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 48c1dd6f8d..09f70793d3 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -949,7 +949,7 @@ connection_ap_process_end_not_open( connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return 0; } - if (get_options()->TestingClientDNSRejectInternalAddresses && + if (get_options()->ClientDNSRejectInternalAddresses && tor_addr_is_internal(&addr, 0)) { log_info(LD_APP,"Address '%s' resolved to internal. Closing,", safe_str(conn->socks_request->address)); @@ -1366,7 +1366,7 @@ connection_edge_process_resolved_cell(edge_connection_t *conn, goto done; } - if (get_options()->TestingClientDNSRejectInternalAddresses) { + if (get_options()->ClientDNSRejectInternalAddresses) { int orig_len = smartlist_len(resolved_addresses); SMARTLIST_FOREACH_BEGIN(resolved_addresses, address_ttl_t *, addr) { if (addr->hostname == NULL && tor_addr_is_internal(&addr->addr, 0)) { @@ -1459,7 +1459,7 @@ connection_edge_process_relay_cell_not_open( if (tor_addr_family(&addr) != AF_UNSPEC) { const sa_family_t family = tor_addr_family(&addr); if (tor_addr_is_null(&addr) || - (get_options()->TestingClientDNSRejectInternalAddresses && + (get_options()->ClientDNSRejectInternalAddresses && tor_addr_is_internal(&addr, 0))) { log_info(LD_APP, "...but it claims the IP address was %s. Closing.", fmt_addr(&addr)); |