diff options
| author | Fabian Keil <fk@fabiankeil.de> | 2011-09-28 18:00:59 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-03 12:56:46 -0400 |
| commit | 13f0d22df0e2dc08749d1841f66567dc252c6957 (patch) | |
| tree | 3041e6cbba30aa15ee2109bdc0154fb1f6980511 /src/or/buffers.c | |
| parent | 1fac96f4c6c399561f80109e71b2441fa06ac808 (diff) | |
| download | tor-13f0d22df0e2dc08749d1841f66567dc252c6957.tar.gz tor-13f0d22df0e2dc08749d1841f66567dc252c6957.zip | |
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.
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 85d58e8986..1025cedad2 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -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, |