diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-28 07:49:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-28 07:49:34 -0400 |
| commit | d416e208e4e94c2b4ccd4e11013151c72180faff (patch) | |
| tree | f35bc9f3fd3336d82133b41352717870cc405d60 /src/or | |
| parent | ddee28a3c9b9dd256cd6560a4766f17a6c6fc13d (diff) | |
| parent | d4bf1f6c8eb08c39def69c839515afe475bf0a6b (diff) | |
| download | tor-d416e208e4e94c2b4ccd4e11013151c72180faff.tar.gz tor-d416e208e4e94c2b4ccd4e11013151c72180faff.zip | |
Merge branch 'bugs25036_25055_clean_033' into maint-0.3.3
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/proto_socks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index 91633d02af..8700fe1269 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -393,7 +393,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->port = ntohs(get_uint16(data+5+len)); *drain_out = 5+len+2; - if (!string_is_valid_hostname(req->address)) { + if (!string_is_valid_dest(req->address)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); log_warn(LD_PROTOCOL, @@ -518,7 +518,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, log_debug(LD_APP,"socks4: Everything is here. Success."); strlcpy(req->address, startaddr ? startaddr : tmpbuf, sizeof(req->address)); - if (!string_is_valid_hostname(req->address)) { + if (!string_is_valid_dest(req->address)) { log_warn(LD_PROTOCOL, "Your application (using socks4 to port %d) gave Tor " "a malformed hostname: %s. Rejecting the connection.", |