[tor-commits] [tor/master] Allow IPv4 and IPv6 addresses in SOCKS5 FQDN requests.

[nickm at torproject.org]

commit d87d4183eee40d172eda5265feb0fddfe723dd06
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Tue Dec 30 16:36:16 2014 +0000

    Allow IPv4 and IPv6 addresses in SOCKS5 FQDN requests.
    
    Supposedly there are a decent number of applications that "support"
    IPv6 and SOCKS5 using the FQDN address type.  While said applications
    should be using the IPv6 address type, allow the connection if
    SafeSocks is not set.
    
    Bug not in any released version.
---
 src/or/buffers.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 4cdc03b..f0d7e60 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -2063,9 +2063,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
               socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED);
               return -1;
             }
-          }
-
-          if (!string_is_valid_hostname(req->address)) {
+          } else if (!string_is_valid_hostname(req->address)) {
             socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR);
 
             log_warn(LD_PROTOCOL,