summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 27dc4d05f5..ee60dbff5a 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1328,8 +1328,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,