romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 09:20:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Viktor Szakats 2026-03-09 00:07:49 +01:00
parent 2f6eec2c77
commit a0f358bd7f
No known key found for this signature in database
28 changed files with 77 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/socks.c
View file

@ -419,7 +419,7 @@ static CURLproxycode socks4_check_resp(struct socks_state *sx,
"[SOCKS] cannot complete SOCKS4 connection to %u.%u.%u.%u:%u. (%u)"
", request rejected or failed.",
resp[4], resp[5], resp[6], resp[7],
((resp[2] << 8) | resp[3]), resp[1]);
(unsigned int)((resp[2] << 8) | resp[3]), resp[1]);
return CURLPX_REQUEST_FAILED;
case 92:
failf(data,
@ -427,7 +427,7 @@ static CURLproxycode socks4_check_resp(struct socks_state *sx,
", request rejected because SOCKS server cannot connect to "
"identd on the client.",
resp[4], resp[5], resp[6], resp[7],
((resp[2] << 8) | resp[3]), resp[1]);
(unsigned int)((resp[2] << 8) | resp[3]), resp[1]);
return CURLPX_IDENTD;
case 93:
failf(data,
@ -435,14 +435,14 @@ static CURLproxycode socks4_check_resp(struct socks_state *sx,
", request rejected because the client program and identd "
"report different user-ids.",
resp[4], resp[5], resp[6], resp[7],
((resp[2] << 8) | resp[3]), resp[1]);
(unsigned int)((resp[2] << 8) | resp[3]), resp[1]);
return CURLPX_IDENTD_DIFFER;
default:
failf(data,
"[SOCKS] cannot complete SOCKS4 connection to %u.%u.%u.%u:%u. (%u)"
", Unknown.",
resp[4], resp[5], resp[6], resp[7],
((resp[2] << 8) | resp[3]), resp[1]);
(unsigned int)((resp[2] << 8) | resp[3]), resp[1]);
return CURLPX_UNKNOWN_FAIL;
}
}
@ -1273,7 +1273,7 @@ static CURLcode socks_proxy_cf_connect(struct Curl_cfilter *cf,
struct ip_quadruple ipquad;
bool is_ipv6;
if(!Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad))
infof(data, "Opened %sSOCKS connection from %s port %u to %s port %u "
infof(data, "Opened %sSOCKS connection from %s port %d to %s port %d "
"(via %s port %u)",
(sockindex == SECONDARYSOCKET) ? "2nd " : "",
ipquad.local_ip, ipquad.local_port,
@ -1308,11 +1308,11 @@ static CURLcode socks_cf_adjust_pollset(struct Curl_cfilter *cf,
case SOCKS5_ST_REQ0_SEND:
case SOCKS5_ST_AUTH_SEND:
case SOCKS5_ST_REQ1_SEND:
CURL_TRC_CF(data, cf, "adjust pollset out (%d)", sx->state);
CURL_TRC_CF(data, cf, "adjust pollset out (%d)", (int)sx->state);
result = Curl_pollset_set_out_only(data, ps, sock);
break;
default:
CURL_TRC_CF(data, cf, "adjust pollset in (%d)", sx->state);
CURL_TRC_CF(data, cf, "adjust pollset in (%d)", (int)sx->state);
result = Curl_pollset_set_in_only(data, ps, sock);
break;
}