romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 11:57:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

cf-socket: ignore SOCK_CLOEXEC etc for socktype equality checks

Browse source 
As the SOCK_CLOEXEC and SOCK_NONBLOCK get ORed to the socktype, this
introduces the cf_socktype() function to use when checking for the
specific socket type: DGRAM or STREAM. The function filters off the
non-type related bits to enable the comparison.

Follow-up to 05367694ec

Closes #20808
This commit is contained in:
Daniel Stenberg 2026-03-07 11:24:18 +01:00
parent e3d7401a32
commit 08d6497005
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/cf-socket.c
View file

@ -1040,6 +1040,19 @@ static CURLcode set_remote_ip(struct Curl_cfilter *cf,
return CURLE_OK;
}
/* to figure out the type of the socket safely, remove the possibly ORed
bits before comparing */
static int cf_socktype(int x)
{
#ifdef SOCK_CLOEXEC
x &= ~SOCK_CLOEXEC;
#endif
#ifdef SOCK_NONBLOCK
x &= ~SOCK_NONBLOCK;
#endif
return x;
}
static CURLcode cf_socket_open(struct Curl_cfilter *cf,
struct Curl_easy *data)
{
@ -1095,10 +1108,10 @@ static CURLcode cf_socket_open(struct Curl_cfilter *cf,
#ifdef USE_IPV6
is_tcp = (ctx->addr.family == AF_INET ||
ctx->addr.family == AF_INET6) &&
ctx->addr.socktype == SOCK_STREAM;
cf_socktype(ctx->addr.socktype) == SOCK_STREAM;
#else
is_tcp = (ctx->addr.family == AF_INET) &&
ctx->addr.socktype == SOCK_STREAM;
cf_socktype(ctx->addr.socktype) == SOCK_STREAM;
#endif
if(is_tcp && data->set.tcp_nodelay)
tcpnodelay(cf, data, ctx->sock);
@ -1163,7 +1176,7 @@ static CURLcode cf_socket_open(struct Curl_cfilter *cf,
}
}
#endif
ctx->sock_connected = (ctx->addr.socktype != SOCK_DGRAM);
ctx->sock_connected = (cf_socktype(ctx->addr.socktype) != SOCK_DGRAM);
out:
if(result) {
if(ctx->sock != CURL_SOCKET_BAD) {