Rephrase the log messages emitted if the TestSocks check is positive

Previously Tor would always claim to have been given a hostname
by the client, while actually only verifying that the client
is using SOCKS4A or SOCKS5 with hostnames. Both protocol versions
allow IP addresses, too, in which case the log messages were wrong.

Fixes #4094.
This commit is contained in:
Fabian Keil 2011-09-28 18:00:59 +02:00 committed by Nick Mathewson
parent 1fac96f4c6
commit 13f0d22df0

View File

@ -1873,9 +1873,9 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
}
if (log_sockstype)
log_notice(LD_APP,
"Your application (using socks5 to port %d) gave "
"Tor a hostname, which means Tor will do the DNS resolve "
"for you. This is good.", req->port);
"Your application (using socks5 to port %d) instructed "
"Tor to take care of the DNS resolution itself if "
"necessary. This is good.", req->port);
return 1;
default: /* unsupported */
log_warn(LD_APP,"socks5: unsupported address type %d. Rejecting.",
@ -1974,9 +1974,9 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
if (log_sockstype)
log_notice(LD_APP,
"Your application (using socks4a to port %d) gave "
"Tor a hostname, which means Tor will do the DNS resolve "
"for you. This is good.", req->port);
"Your application (using socks4a to port %d) instructed "
"Tor to take care of the DNS resolution itself if "
"necessary. This is good.", req->port);
}
log_debug(LD_APP,"socks4: Everything is here. Success.");
strlcpy(req->address, startaddr ? startaddr : tmpbuf,