romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-19 21:05:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

vquic: fix UDP_GRO struct cmsghdr data type

Browse source 
The data type for UDP_GRO in struct cmsghdr is int. Limit the usage of
UDP_GRO to linux only because it is not portable.

Closes #14056
This commit is contained in:
Tatsuhiro Tsujikawa 2024-06-29 09:55:55 +09:00 • committed by Daniel Stenberg
parent 4fab113d4e
commit 9feb85a1e3
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/cf-socket.c
View file

@ -1899,7 +1899,8 @@ static CURLcode cf_udp_setup_quic(struct Curl_cfilter *cf,
#endif
}
#if defined(UDP_GRO) && (defined(HAVE_SENDMMSG) || defined(HAVE_SENDMSG)) && \
#if defined(__linux__) && defined(UDP_GRO) && \
(defined(HAVE_SENDMMSG) || defined(HAVE_SENDMSG)) && \
((defined(USE_NGTCP2) && defined(USE_NGHTTP3)) || defined(USE_QUICHE))
(void)setsockopt(ctx->sock, IPPROTO_UDP, UDP_GRO, &one,
(socklen_t)sizeof(one));

6
lib/vquic/vquic.c
View file

@ -335,8 +335,8 @@ CURLcode vquic_send_tail_split(struct Curl_cfilter *cf, struct Curl_easy *data,
#if defined(HAVE_SENDMMSG) || defined(HAVE_SENDMSG)
static size_t msghdr_get_udp_gro(struct msghdr *msg)
{
uint16_t gso_size = 0;
#ifdef UDP_GRO
int gso_size = 0;
#if defined(__linux__) && defined(UDP_GRO)
struct cmsghdr *cmsg;
/* Workaround musl CMSG_NXTHDR issue */
@ -358,7 +358,7 @@ static size_t msghdr_get_udp_gro(struct msghdr *msg)
#endif
(void)msg;
return gso_size;
return (size_t)gso_size;
}
#endif