luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socks: allow using DoH to resolve host names

Browse Source 
For SOCKS modes where a local host resolve is done.

It was previously disabled in 12d655d456, but a few local tests seem to
indicate that it works fine. Works now because of the SOCKS refactor of
4a4b63daaa that made it non-blocking.

Reported-by: roughtex on github
Fixes #10537
Closes #10540
This commit is contained in:
Daniel Stenberg 2023-02-16 23:52:22 +01:00
parent 4437e3e344
commit 6d860f1758
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/socks.c
View File

@ -316,7 +316,7 @@ static CURLproxycode do_SOCKS4(struct Curl_cfilter *cf,
/* DNS resolve only for SOCKS4, not SOCKS4a */ /* DNS resolve only for SOCKS4, not SOCKS4a */
if(!protocol4a) { if(!protocol4a) {
enum resolve_t rc = enum resolve_t rc =
Curl_resolv(data, sx->hostname, sx->remote_port, FALSE, &dns); Curl_resolv(data, sx->hostname, sx->remote_port, TRUE, &dns);
if(rc == CURLRESOLV_ERROR) if(rc == CURLRESOLV_ERROR)
return CURLPX_RESOLVE_HOST; return CURLPX_RESOLVE_HOST;
@ -783,7 +783,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
case CONNECT_REQ_INIT: case CONNECT_REQ_INIT:
if(socks5_resolve_local) { if(socks5_resolve_local) {
enum resolve_t rc = Curl_resolv(data, sx->hostname, sx->remote_port, enum resolve_t rc = Curl_resolv(data, sx->hostname, sx->remote_port,
FALSE, &dns); TRUE, &dns);
if(rc == CURLRESOLV_ERROR) if(rc == CURLRESOLV_ERROR)
return CURLPX_RESOLVE_HOST; return CURLPX_RESOLVE_HOST;