diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-14 11:19:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-14 11:19:08 -0400 |
| commit | 1b28f366b8796a9e6d27af74146dbc7836100263 (patch) | |
| tree | 327f71603339d159e0eea8b45e7983d74aa2a3a0 /src/or | |
| parent | c6ca199888102a825f004f8613331f97525da486 (diff) | |
| download | tor-1b28f366b8796a9e6d27af74146dbc7836100263.tar.gz tor-1b28f366b8796a9e6d27af74146dbc7836100263.zip | |
Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells
Fixes bug 8475; bugfix on 0.2.0.7-alpha.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/relay.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index a17c333310..e69eade97b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -969,12 +969,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); |