nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-20 14:47:49 -04:00
commit 7c2eabcf8e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug8475 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- If configured via ClientDNSRejectInternalAddresses not to report
DNS queries which have resolved to internal addresses, apply that
rule to IPv6 as well. Fixes bug 8475; bugfix on 0.2.0.7-alpha.

13
src/or/relay.c
View File

@ -1140,12 +1140,15 @@ connection_edge_process_relay_cell_not_open(
2+answer_len));
else
ttl = -1;
if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2));
if (get_options()->ClientDNSRejectInternalAddresses &&
is_internal_IP(addr, 0)) {
if (answer_type == RESOLVED_TYPE_IPV4 ||
answer_type == RESOLVED_TYPE_IPV6) {
tor_addr_t addr;
if (decode_address_from_payload(&addr, cell->payload+RELAY_HEADER_SIZE,
rh->length) &&
tor_addr_is_internal(&addr, 0) &&
get_options()->ClientDNSRejectInternalAddresses) {
log_info(LD_APP,"Got a resolve with answer %s. Rejecting.",
fmt_addr32(addr));
fmt_addr(&addr));
connection_ap_handshake_socks_resolved(entry_conn,
RESOLVED_TYPE_ERROR_TRANSIENT,
0, NULL, 0, TIME_MAX);