romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 01:24:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

ngtcp2: build without sendmsg

Browse source 
Closes #8981
This commit is contained in:
Tatsuhiro Tsujikawa 2022-06-10 09:09:39 +02:00 • committed by Daniel Stenberg
parent d2c6d8be18
commit 927ede7edc
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -3446,6 +3446,7 @@ AC_CHECK_FUNCS([fnmatch \
mach_absolute_time \
pipe \
sched_yield \
sendmsg \
setlocale \
setmode \
setrlimit \

32
lib/vquic/ngtcp2.c
View file

@ -728,7 +728,7 @@ CURLcode Curl_quic_connect(struct Curl_easy *data,
ngtcp2_connection_close_error_default(&qs->last_error);
#if defined(__linux__) && defined(UDP_SEGMENT)
#if defined(__linux__) && defined(UDP_SEGMENT) & defined(HAVE_SENDMSG)
qs->no_gso = FALSE;
#else
qs->no_gso = TRUE;
@ -1647,9 +1647,10 @@ static CURLcode do_sendmsg(size_t *psent, struct Curl_easy *data, int sockfd,
struct quicsocket *qs, const uint8_t *pkt,
size_t pktlen, size_t gsolen)
{
#ifdef HAVE_SENDMSG
struct iovec msg_iov = {(void *)pkt, pktlen};
struct msghdr msg = {0};
uint8_t msg_ctrl[CMSG_SPACE(sizeof(uint16_t))] = {0};
uint8_t msg_ctrl[32];
size_t ctrllen = 0;
ssize_t sent;
#if defined(__linux__) && defined(UDP_SEGMENT)
@ -1658,6 +1659,8 @@ static CURLcode do_sendmsg(size_t *psent, struct Curl_easy *data, int sockfd,
*psent = 0;
assert(sizeof(msg_ctrl) >= CMSG_SPACE(sizeof(uint16_t)));
msg.msg_iov = &msg_iov;
msg.msg_iovlen = 1;
@ -1708,6 +1711,31 @@ static CURLcode do_sendmsg(size_t *psent, struct Curl_easy *data, int sockfd,
else {
assert(pktlen == (size_t)sent);
}
#else
ssize_t sent;
(void)qs;
(void)gsolen;
*psent = 0;
while((sent = send(sockfd, (const char *)pkt, pktlen, 0)) == -1 &&
SOCKERRNO == EINTR)
;
if(sent == -1) {
if(SOCKERRNO == EAGAIN || SOCKERRNO == EWOULDBLOCK) {
return CURLE_AGAIN;
}
else {
failf(data, "send() returned %zd (errno %d)", sent, SOCKERRNO);
if(SOCKERRNO != EMSGSIZE) {
return CURLE_SEND_ERROR;
}
/* UDP datagram is too large; caused by PMTUD. Just let it be
lost. */
}
}
#endif
*psent = pktlen;