diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-18 18:51:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-18 18:51:34 +0000 |
| commit | a62a24036ddb7449cd19f7c26de457779d30fdd1 (patch) | |
| tree | d8d292866ef27c600a481f61ddf597f61c7c0b77 /src/or/connection_edge.c | |
| parent | 7dd78f15760ca556258517aff39b65c672267422 (diff) | |
| download | tor-a62a24036ddb7449cd19f7c26de457779d30fdd1.tar.gz tor-a62a24036ddb7449cd19f7c26de457779d30fdd1.zip | |
r18937@catbus: nickm | 2008-03-18 14:50:39 -0400
Fix the other lingering part of bug 617: make ClientDNSRejectInternalAddresses actually work.
svn:r14107
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 549c20c78f..a231623981 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1331,8 +1331,17 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, if (options->ClientDNSRejectInternalAddresses) { /* Don't let people try to do a reverse lookup on 10.0.0.1. */ tor_addr_t addr; - if (tor_addr_from_str(&addr, socks->address) >= 0 && - tor_addr_is_internal(&addr, 0)) { + struct in_addr in; + int ok; + if (!strcasecmpend(socks->address, ".in-addr.arpa")) + ok = !parse_inaddr_arpa_address(socks->address, &in); + else + ok = tor_inet_aton(socks->address, &in); + /*XXXX021 make this a function. */ + addr.family = AF_INET; + memcpy(&addr.addr.in_addr, &in, sizeof(struct in_addr)); + + if (ok && tor_addr_is_internal(&addr, 0)) { connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_ERROR, 0, NULL, -1, TIME_MAX); connection_mark_unattached_ap(conn, |