nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rephrase the log messages emitted if the TestSocks check is positive

Browse Source 
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
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/buffers.c
View File

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