2022-12-30 16:14:55 +08:00
|
|
|
/***************************************************************************
|
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2023-01-02 20:51:48 +08:00
|
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
2022-12-30 16:14:55 +08:00
|
|
|
*
|
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
|
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
|
|
*
|
|
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
|
|
*
|
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: curl
|
|
|
|
*
|
|
|
|
***************************************************************************/
|
|
|
|
|
|
|
|
#include "curl_setup.h"
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
#include <netinet/in.h> /* <netinet/tcp.h> may need it */
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
#include <sys/un.h> /* for sockaddr_un */
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_LINUX_TCP_H
|
|
|
|
#include <linux/tcp.h>
|
|
|
|
#elif defined(HAVE_NETINET_TCP_H)
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#endif
|
2024-06-25 17:51:03 +08:00
|
|
|
#ifdef HAVE_NETINET_UDP_H
|
|
|
|
#include <netinet/udp.h>
|
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NETDB_H
|
|
|
|
#include <netdb.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __VMS
|
|
|
|
#include <in.h>
|
|
|
|
#include <inet.h>
|
|
|
|
#endif
|
|
|
|
|
2024-06-01 18:36:04 +08:00
|
|
|
#ifdef __DragonFly__
|
|
|
|
/* Required for __DragonFly_version */
|
|
|
|
#include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
#include "urldata.h"
|
2023-03-30 19:25:20 +08:00
|
|
|
#include "bufq.h"
|
2022-12-30 16:14:55 +08:00
|
|
|
#include "sendf.h"
|
|
|
|
#include "if2ip.h"
|
|
|
|
#include "strerror.h"
|
|
|
|
#include "cfilters.h"
|
|
|
|
#include "cf-socket.h"
|
|
|
|
#include "connect.h"
|
|
|
|
#include "select.h"
|
|
|
|
#include "url.h" /* for Curl_safefree() */
|
|
|
|
#include "multiif.h"
|
|
|
|
#include "sockaddr.h" /* required for Curl_sockaddr_storage */
|
|
|
|
#include "inet_ntop.h"
|
|
|
|
#include "inet_pton.h"
|
|
|
|
#include "progress.h"
|
|
|
|
#include "warnless.h"
|
|
|
|
#include "conncache.h"
|
|
|
|
#include "multihandle.h"
|
2023-08-29 19:08:35 +08:00
|
|
|
#include "rand.h"
|
2022-12-30 16:14:55 +08:00
|
|
|
#include "share.h"
|
2024-05-17 19:44:44 +08:00
|
|
|
#include "strdup.h"
|
2022-12-30 16:14:55 +08:00
|
|
|
#include "version_win32.h"
|
|
|
|
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
|
|
#include "curl_printf.h"
|
|
|
|
#include "curl_memory.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
|
|
|
|
|
2024-04-11 20:01:58 +08:00
|
|
|
#if defined(USE_IPV6) && defined(IPV6_V6ONLY) && defined(_WIN32)
|
2023-04-15 23:08:40 +08:00
|
|
|
/* It makes support for IPv4-mapped IPv6 addresses.
|
|
|
|
* Linux kernel, NetBSD, FreeBSD and Darwin: default is off;
|
|
|
|
* Windows Vista and later: default is on;
|
|
|
|
* DragonFly BSD: acts like off, and dummy setting;
|
|
|
|
* OpenBSD and earlier Windows: unsupported.
|
|
|
|
* Linux: controlled by /proc/sys/net/ipv6/bindv6only.
|
|
|
|
*/
|
|
|
|
static void set_ipv6_v6only(curl_socket_t sockfd, int on)
|
|
|
|
{
|
|
|
|
(void)setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on));
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define set_ipv6_v6only(x,y)
|
|
|
|
#endif
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd)
|
|
|
|
{
|
|
|
|
#if defined(TCP_NODELAY)
|
|
|
|
curl_socklen_t onoff = (curl_socklen_t) 1;
|
|
|
|
int level = IPPROTO_TCP;
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
|
|
|
|
if(setsockopt(sockfd, level, TCP_NODELAY, (void *)&onoff,
|
|
|
|
sizeof(onoff)) < 0)
|
|
|
|
infof(data, "Could not set TCP_NODELAY: %s",
|
|
|
|
Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
|
|
|
|
#else
|
|
|
|
(void)data;
|
|
|
|
(void)sockfd;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef SO_NOSIGPIPE
|
|
|
|
/* The preferred method on Mac OS X (10.2 and later) to prevent SIGPIPEs when
|
|
|
|
sending data to a dead peer (instead of relying on the 4th argument to send
|
|
|
|
being MSG_NOSIGNAL). Possibly also existing and in use on other BSD
|
|
|
|
systems? */
|
|
|
|
static void nosigpipe(struct Curl_easy *data,
|
|
|
|
curl_socket_t sockfd)
|
|
|
|
{
|
|
|
|
int onoff = 1;
|
2023-10-13 08:25:20 +08:00
|
|
|
(void)data;
|
2022-12-30 16:14:55 +08:00
|
|
|
if(setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&onoff,
|
|
|
|
sizeof(onoff)) < 0) {
|
|
|
|
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
infof(data, "Could not set SO_NOSIGPIPE: %s",
|
|
|
|
Curl_strerror(SOCKERRNO, buffer, sizeof(buffer)));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define nosigpipe(x,y) Curl_nop_stmt
|
|
|
|
#endif
|
|
|
|
|
2024-06-01 18:36:04 +08:00
|
|
|
#if defined(USE_WINSOCK) || \
|
2024-06-03 15:15:55 +08:00
|
|
|
(defined(__sun) && !defined(TCP_KEEPIDLE)) || \
|
2024-06-05 11:30:16 +08:00
|
|
|
(defined(__DragonFly__) && __DragonFly_version < 500702) || \
|
|
|
|
(defined(_WIN32) && !defined(TCP_KEEPIDLE))
|
|
|
|
/* Solaris < 11.4, DragonFlyBSD < 500702 and Windows < 10.0.16299
|
2024-06-03 15:15:55 +08:00
|
|
|
* use millisecond units. */
|
2022-12-30 16:14:55 +08:00
|
|
|
#define KEEPALIVE_FACTOR(x) (x *= 1000)
|
|
|
|
#else
|
|
|
|
#define KEEPALIVE_FACTOR(x)
|
|
|
|
#endif
|
|
|
|
|
2023-12-10 04:37:11 +08:00
|
|
|
#if defined(USE_WINSOCK) && !defined(SIO_KEEPALIVE_VALS)
|
2022-12-30 16:14:55 +08:00
|
|
|
#define SIO_KEEPALIVE_VALS _WSAIOW(IOC_VENDOR,4)
|
|
|
|
|
|
|
|
struct tcp_keepalive {
|
|
|
|
u_long onoff;
|
|
|
|
u_long keepalivetime;
|
|
|
|
u_long keepaliveinterval;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void
|
|
|
|
tcpkeepalive(struct Curl_easy *data,
|
|
|
|
curl_socket_t sockfd)
|
|
|
|
{
|
|
|
|
int optval = data->set.tcp_keepalive?1:0;
|
|
|
|
|
|
|
|
/* only set IDLE and INTVL if setting KEEPALIVE is successful */
|
|
|
|
if(setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
2024-01-17 13:10:40 +08:00
|
|
|
infof(data, "Failed to set SO_KEEPALIVE on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
else {
|
2024-06-05 11:30:16 +08:00
|
|
|
#if defined(SIO_KEEPALIVE_VALS) /* Windows */
|
|
|
|
/* Windows 10, version 1709 (10.0.16299) and later versions */
|
|
|
|
#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && defined(TCP_KEEPCNT)
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepidle);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
|
|
|
|
(const char *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPIDLE on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepintvl);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
|
|
|
|
(const char *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPINTVL on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepcnt);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT,
|
|
|
|
(const char *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPCNT on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
|
|
|
#else /* Windows < 10.0.16299 */
|
2022-12-30 16:14:55 +08:00
|
|
|
struct tcp_keepalive vals;
|
|
|
|
DWORD dummy;
|
|
|
|
vals.onoff = 1;
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepidle);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
2024-06-03 04:30:52 +08:00
|
|
|
vals.keepalivetime = (u_long)optval;
|
2022-12-30 16:14:55 +08:00
|
|
|
optval = curlx_sltosi(data->set.tcp_keepintvl);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
2024-06-03 04:30:52 +08:00
|
|
|
vals.keepaliveinterval = (u_long)optval;
|
2022-12-30 16:14:55 +08:00
|
|
|
if(WSAIoctl(sockfd, SIO_KEEPALIVE_VALS, (LPVOID) &vals, sizeof(vals),
|
|
|
|
NULL, 0, &dummy, NULL, NULL) != 0) {
|
2023-12-08 21:05:09 +08:00
|
|
|
infof(data, "Failed to set SIO_KEEPALIVE_VALS on fd "
|
2024-01-17 13:10:40 +08:00
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
2024-06-05 11:30:16 +08:00
|
|
|
#endif
|
|
|
|
#else /* !Windows */
|
2022-12-30 16:14:55 +08:00
|
|
|
#ifdef TCP_KEEPIDLE
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepidle);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
2024-01-17 13:10:40 +08:00
|
|
|
infof(data, "Failed to set TCP_KEEPIDLE on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
#elif defined(TCP_KEEPALIVE)
|
|
|
|
/* Mac OS X style */
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepidle);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
2024-01-17 13:10:40 +08:00
|
|
|
infof(data, "Failed to set TCP_KEEPALIVE on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
2024-06-03 15:15:55 +08:00
|
|
|
#elif defined(TCP_KEEPALIVE_THRESHOLD)
|
|
|
|
/* Solaris <11.4 style */
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepidle);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPALIVE_THRESHOLD on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
|
|
|
#ifdef TCP_KEEPINTVL
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepintvl);
|
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
2024-01-17 13:10:40 +08:00
|
|
|
infof(data, "Failed to set TCP_KEEPINTVL on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
2024-06-03 15:15:55 +08:00
|
|
|
#elif defined(TCP_KEEPALIVE_ABORT_THRESHOLD)
|
|
|
|
/* Solaris <11.4 style */
|
|
|
|
/* TCP_KEEPALIVE_ABORT_THRESHOLD should equal to
|
|
|
|
* TCP_KEEPCNT * TCP_KEEPINTVL on other platforms.
|
|
|
|
* The default value of TCP_KEEPCNT is 9 on Linux,
|
2024-06-05 11:30:16 +08:00
|
|
|
* 8 on *BSD/macOS, 5 or 10 on Windows. We use the
|
|
|
|
* default config for Solaris <11.4 because there is
|
|
|
|
* no default value for TCP_KEEPCNT on Solaris 11.4.
|
2024-06-03 15:15:55 +08:00
|
|
|
*
|
|
|
|
* Note that the consequent probes will not be sent
|
|
|
|
* at equal intervals on Solaris, but will be sent
|
|
|
|
* using the exponential backoff algorithm. */
|
2024-06-05 11:30:16 +08:00
|
|
|
optval = curlx_sltosi(data->set.tcp_keepcnt) *
|
|
|
|
curlx_sltosi(data->set.tcp_keepintvl);
|
2024-06-03 15:15:55 +08:00
|
|
|
KEEPALIVE_FACTOR(optval);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_ABORT_THRESHOLD,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPALIVE_ABORT_THRESHOLD on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
2024-06-05 11:30:16 +08:00
|
|
|
#ifdef TCP_KEEPCNT
|
|
|
|
optval = curlx_sltosi(data->set.tcp_keepcnt);
|
|
|
|
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0) {
|
|
|
|
infof(data, "Failed to set TCP_KEEPCNT on fd "
|
|
|
|
"%" CURL_FORMAT_SOCKET_T ": errno %d",
|
|
|
|
sockfd, SOCKERRNO);
|
|
|
|
}
|
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-22 15:00:16 +08:00
|
|
|
/**
|
|
|
|
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and
|
|
|
|
* set the transport used.
|
|
|
|
*/
|
2023-05-25 17:03:56 +08:00
|
|
|
void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
|
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
int transport)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The Curl_sockaddr_ex structure is basically libcurl's external API
|
|
|
|
* curl_sockaddr structure with enough space available to directly hold
|
|
|
|
* any protocol-specific address structures. The variable declared here
|
|
|
|
* will be used to pass / receive data to/from the fopensocket callback
|
|
|
|
* if this has been set, before that, it is initialized from parameters.
|
|
|
|
*/
|
2023-01-03 20:13:37 +08:00
|
|
|
dest->family = ai->ai_family;
|
2022-12-30 16:14:55 +08:00
|
|
|
switch(transport) {
|
|
|
|
case TRNSPRT_TCP:
|
2023-01-03 20:13:37 +08:00
|
|
|
dest->socktype = SOCK_STREAM;
|
|
|
|
dest->protocol = IPPROTO_TCP;
|
2022-12-30 16:14:55 +08:00
|
|
|
break;
|
|
|
|
case TRNSPRT_UNIX:
|
2023-01-03 20:13:37 +08:00
|
|
|
dest->socktype = SOCK_STREAM;
|
|
|
|
dest->protocol = IPPROTO_IP;
|
2022-12-30 16:14:55 +08:00
|
|
|
break;
|
|
|
|
default: /* UDP and QUIC */
|
2023-01-03 20:13:37 +08:00
|
|
|
dest->socktype = SOCK_DGRAM;
|
|
|
|
dest->protocol = IPPROTO_UDP;
|
2022-12-30 16:14:55 +08:00
|
|
|
break;
|
|
|
|
}
|
2024-06-03 04:30:52 +08:00
|
|
|
dest->addrlen = (unsigned int)ai->ai_addrlen;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
if(dest->addrlen > sizeof(struct Curl_sockaddr_storage))
|
2023-04-29 00:07:33 +08:00
|
|
|
dest->addrlen = sizeof(struct Curl_sockaddr_storage);
|
2023-01-03 20:13:37 +08:00
|
|
|
memcpy(&dest->sa_addr, ai->ai_addr, dest->addrlen);
|
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
static CURLcode socket_open(struct Curl_easy *data,
|
|
|
|
struct Curl_sockaddr_ex *addr,
|
|
|
|
curl_socket_t *sockfd)
|
|
|
|
{
|
|
|
|
DEBUGASSERT(data);
|
|
|
|
DEBUGASSERT(data->conn);
|
2022-12-30 16:14:55 +08:00
|
|
|
if(data->set.fopensocket) {
|
|
|
|
/*
|
|
|
|
* If the opensocket callback is set, all the destination address
|
|
|
|
* information is passed to the callback. Depending on this information the
|
|
|
|
* callback may opt to abort the connection, this is indicated returning
|
|
|
|
* CURL_SOCKET_BAD; otherwise it will return a not-connected socket. When
|
|
|
|
* the callback returns a valid socket the destination address information
|
|
|
|
* might have been changed and this 'new' address will actually be used
|
|
|
|
* here to connect.
|
|
|
|
*/
|
|
|
|
Curl_set_in_callback(data, true);
|
|
|
|
*sockfd = data->set.fopensocket(data->set.opensocket_client,
|
|
|
|
CURLSOCKTYPE_IPCXN,
|
|
|
|
(struct curl_sockaddr *)addr);
|
|
|
|
Curl_set_in_callback(data, false);
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
else {
|
2022-12-30 16:14:55 +08:00
|
|
|
/* opensocket callback not set, so simply create the socket now */
|
|
|
|
*sockfd = socket(addr->family, addr->socktype, addr->protocol);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
if(*sockfd == CURL_SOCKET_BAD)
|
|
|
|
/* no socket, no connection */
|
|
|
|
return CURLE_COULDNT_CONNECT;
|
|
|
|
|
2024-04-11 20:01:58 +08:00
|
|
|
#if defined(USE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
|
2023-01-03 20:13:37 +08:00
|
|
|
if(data->conn->scope_id && (addr->family == AF_INET6)) {
|
2022-12-30 16:14:55 +08:00
|
|
|
struct sockaddr_in6 * const sa6 = (void *)&addr->sa_addr;
|
2023-01-03 20:13:37 +08:00
|
|
|
sa6->sin6_scope_id = data->conn->scope_id;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
/*
|
|
|
|
* Create a socket based on info from 'conn' and 'ai'.
|
|
|
|
*
|
|
|
|
* 'addr' should be a pointer to the correct struct to get data back, or NULL.
|
|
|
|
* 'sockfd' must be a pointer to a socket descriptor.
|
|
|
|
*
|
|
|
|
* If the open socket callback is set, used that!
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
CURLcode Curl_socket_open(struct Curl_easy *data,
|
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
struct Curl_sockaddr_ex *addr,
|
|
|
|
int transport,
|
|
|
|
curl_socket_t *sockfd)
|
|
|
|
{
|
|
|
|
struct Curl_sockaddr_ex dummy;
|
|
|
|
|
|
|
|
if(!addr)
|
2024-07-01 22:47:21 +08:00
|
|
|
/* if the caller does not want info back, use a local temp copy */
|
2023-01-03 20:13:37 +08:00
|
|
|
addr = &dummy;
|
|
|
|
|
2023-05-25 17:03:56 +08:00
|
|
|
Curl_sock_assign_addr(addr, ai, transport);
|
2023-01-03 20:13:37 +08:00
|
|
|
return socket_open(data, addr, sockfd);
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static int socket_close(struct Curl_easy *data, struct connectdata *conn,
|
|
|
|
int use_callback, curl_socket_t sock)
|
|
|
|
{
|
|
|
|
if(use_callback && conn && conn->fclosesocket) {
|
|
|
|
int rc;
|
|
|
|
Curl_multi_closed(data, sock);
|
|
|
|
Curl_set_in_callback(data, true);
|
|
|
|
rc = conn->fclosesocket(conn->closesocket_client, sock);
|
|
|
|
Curl_set_in_callback(data, false);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(conn)
|
|
|
|
/* tell the multi-socket code about this */
|
|
|
|
Curl_multi_closed(data, sock);
|
|
|
|
|
|
|
|
sclose(sock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Close a socket.
|
|
|
|
*
|
|
|
|
* 'conn' can be NULL, beware!
|
|
|
|
*/
|
|
|
|
int Curl_socket_close(struct Curl_easy *data, struct connectdata *conn,
|
|
|
|
curl_socket_t sock)
|
|
|
|
{
|
|
|
|
return socket_close(data, conn, FALSE, sock);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
/* When you run a program that uses the Windows Sockets API, you may
|
|
|
|
experience slow performance when you copy data to a TCP server.
|
|
|
|
|
|
|
|
https://support.microsoft.com/kb/823764
|
|
|
|
|
|
|
|
Work-around: Make the Socket Send Buffer Size Larger Than the Program Send
|
|
|
|
Buffer Size
|
|
|
|
|
|
|
|
The problem described in this knowledge-base is applied only to pre-Vista
|
2024-07-01 22:47:21 +08:00
|
|
|
Windows. Following function trying to detect OS version and skips
|
2022-12-30 16:14:55 +08:00
|
|
|
SO_SNDBUF adjustment for Windows Vista and above.
|
|
|
|
*/
|
|
|
|
#define DETECT_OS_NONE 0
|
|
|
|
#define DETECT_OS_PREVISTA 1
|
|
|
|
#define DETECT_OS_VISTA_OR_LATER 2
|
|
|
|
|
2024-05-27 02:56:24 +08:00
|
|
|
void Curl_sndbuf_init(curl_socket_t sockfd)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
int val = CURL_MAX_WRITE_SIZE + 32;
|
|
|
|
int curval = 0;
|
|
|
|
int curlen = sizeof(curval);
|
|
|
|
|
|
|
|
static int detectOsState = DETECT_OS_NONE;
|
|
|
|
|
|
|
|
if(detectOsState == DETECT_OS_NONE) {
|
|
|
|
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
|
|
|
|
VERSION_GREATER_THAN_EQUAL))
|
|
|
|
detectOsState = DETECT_OS_VISTA_OR_LATER;
|
|
|
|
else
|
|
|
|
detectOsState = DETECT_OS_PREVISTA;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(detectOsState == DETECT_OS_VISTA_OR_LATER)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if(getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (char *)&curval, &curlen) == 0)
|
|
|
|
if(curval > val)
|
|
|
|
return;
|
|
|
|
|
|
|
|
setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (const char *)&val, sizeof(val));
|
|
|
|
}
|
2024-05-24 16:09:32 +08:00
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
|
2024-05-17 19:44:44 +08:00
|
|
|
/*
|
|
|
|
* Curl_parse_interface()
|
|
|
|
*
|
|
|
|
* This is used to parse interface argument in the following formats.
|
|
|
|
* In all the examples, `host` can be an IP address or a hostname.
|
|
|
|
*
|
|
|
|
* <iface_or_host> - can be either an interface name or a host.
|
|
|
|
* if!<iface> - interface name.
|
2024-07-01 22:47:21 +08:00
|
|
|
* host!<host> - hostname.
|
|
|
|
* ifhost!<iface>!<host> - interface name and hostname.
|
2024-05-17 19:44:44 +08:00
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
*
|
|
|
|
* input [in] - input string.
|
|
|
|
* len [in] - length of the input string.
|
|
|
|
* dev [in/out] - address where a pointer to newly allocated memory
|
|
|
|
* holding the interface-or-host will be stored upon
|
|
|
|
* completion.
|
|
|
|
* iface [in/out] - address where a pointer to newly allocated memory
|
|
|
|
* holding the interface will be stored upon completion.
|
|
|
|
* host [in/out] - address where a pointer to newly allocated memory
|
|
|
|
* holding the host will be stored upon completion.
|
|
|
|
*
|
|
|
|
* Returns CURLE_OK on success.
|
|
|
|
*/
|
|
|
|
CURLcode Curl_parse_interface(const char *input, size_t len,
|
|
|
|
char **dev, char **iface, char **host)
|
|
|
|
{
|
|
|
|
static const char if_prefix[] = "if!";
|
|
|
|
static const char host_prefix[] = "host!";
|
|
|
|
static const char if_host_prefix[] = "ifhost!";
|
|
|
|
|
|
|
|
DEBUGASSERT(dev);
|
|
|
|
DEBUGASSERT(iface);
|
|
|
|
DEBUGASSERT(host);
|
|
|
|
|
|
|
|
if(strncmp(if_prefix, input, strlen(if_prefix)) == 0) {
|
|
|
|
input += strlen(if_prefix);
|
|
|
|
if(!*input)
|
|
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
|
|
*iface = Curl_memdup0(input, len - strlen(if_prefix));
|
|
|
|
return *iface ? CURLE_OK : CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
if(strncmp(host_prefix, input, strlen(host_prefix)) == 0) {
|
|
|
|
input += strlen(host_prefix);
|
|
|
|
if(!*input)
|
|
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
|
|
*host = Curl_memdup0(input, len - strlen(host_prefix));
|
|
|
|
return *host ? CURLE_OK : CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
if(strncmp(if_host_prefix, input, strlen(if_host_prefix)) == 0) {
|
|
|
|
const char *host_part;
|
|
|
|
input += strlen(if_host_prefix);
|
|
|
|
len -= strlen(if_host_prefix);
|
|
|
|
host_part = memchr(input, '!', len);
|
|
|
|
if(!host_part || !*(host_part + 1))
|
|
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
|
|
*iface = Curl_memdup0(input, host_part - input);
|
|
|
|
if(!*iface)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
++host_part;
|
|
|
|
*host = Curl_memdup0(host_part, len - (host_part - input));
|
|
|
|
if(!*host) {
|
|
|
|
free(*iface);
|
|
|
|
*iface = NULL;
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!*input)
|
|
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
|
|
*dev = Curl_memdup0(input, len);
|
|
|
|
return *dev ? CURLE_OK : CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
2023-08-17 20:36:30 +08:00
|
|
|
#ifndef CURL_DISABLE_BINDLOCAL
|
2022-12-30 16:14:55 +08:00
|
|
|
static CURLcode bindlocal(struct Curl_easy *data, struct connectdata *conn,
|
|
|
|
curl_socket_t sockfd, int af, unsigned int scope)
|
|
|
|
{
|
|
|
|
struct Curl_sockaddr_storage sa;
|
|
|
|
struct sockaddr *sock = (struct sockaddr *)&sa; /* bind to this address */
|
|
|
|
curl_socklen_t sizeof_sa = 0; /* size of the data sock points to */
|
|
|
|
struct sockaddr_in *si4 = (struct sockaddr_in *)&sa;
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&sa;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct Curl_dns_entry *h = NULL;
|
|
|
|
unsigned short port = data->set.localport; /* use this port number, 0 for
|
|
|
|
"random" */
|
|
|
|
/* how many port numbers to try to bind to, increasing one at a time */
|
|
|
|
int portnum = data->set.localportrange;
|
|
|
|
const char *dev = data->set.str[STRING_DEVICE];
|
2024-05-17 19:44:44 +08:00
|
|
|
const char *iface_input = data->set.str[STRING_INTERFACE];
|
|
|
|
const char *host_input = data->set.str[STRING_BINDHOST];
|
|
|
|
const char *iface = iface_input ? iface_input : dev;
|
|
|
|
const char *host = host_input ? host_input : dev;
|
2022-12-30 16:14:55 +08:00
|
|
|
int error;
|
|
|
|
#ifdef IP_BIND_ADDRESS_NO_PORT
|
|
|
|
int on = 1;
|
|
|
|
#endif
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifndef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
(void)scope;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*************************************************************
|
|
|
|
* Select device to bind socket to
|
|
|
|
*************************************************************/
|
2024-05-17 19:44:44 +08:00
|
|
|
if(!iface && !host && !port)
|
2022-12-30 16:14:55 +08:00
|
|
|
/* no local kind of binding was requested */
|
|
|
|
return CURLE_OK;
|
|
|
|
|
|
|
|
memset(&sa, 0, sizeof(struct Curl_sockaddr_storage));
|
|
|
|
|
2024-05-17 19:44:44 +08:00
|
|
|
if(iface && (strlen(iface)<255) ) {
|
2022-12-30 16:14:55 +08:00
|
|
|
char myhost[256] = "";
|
|
|
|
int done = 0; /* -1 for error, 1 for address found */
|
2024-05-17 19:44:44 +08:00
|
|
|
if2ip_result_t if2ip_result = IF2IP_NOT_FOUND;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
/* interface */
|
|
|
|
#ifdef SO_BINDTODEVICE
|
2024-05-17 19:44:44 +08:00
|
|
|
/*
|
|
|
|
* This binds the local socket to a particular interface. This will
|
|
|
|
* force even requests to other local interfaces to go out the external
|
|
|
|
* interface. Only bind to the interface when specified as interface,
|
|
|
|
* not just as a hostname or ip address.
|
|
|
|
*
|
|
|
|
* The interface might be a VRF, eg: vrf-blue, which means it cannot be
|
|
|
|
* converted to an IP address and would fail Curl_if2ip. Simply try to
|
|
|
|
* use it straight away.
|
|
|
|
*/
|
|
|
|
if(setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE,
|
|
|
|
iface, (curl_socklen_t)strlen(iface) + 1) == 0) {
|
2024-07-01 22:47:21 +08:00
|
|
|
/* This is often "errno 1, error: Operation not permitted" if you are
|
2024-05-17 19:44:44 +08:00
|
|
|
* not running as root or another suitable privileged user. If it
|
|
|
|
* succeeds it means the parameter was a valid interface and not an IP
|
|
|
|
* address. Return immediately.
|
|
|
|
*/
|
|
|
|
if(!host_input) {
|
|
|
|
infof(data, "socket successfully bound to interface '%s'", iface);
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
2024-05-17 19:44:44 +08:00
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
2024-05-17 19:44:44 +08:00
|
|
|
if(!host_input) {
|
|
|
|
/* Discover IP from input device, then bind to it */
|
|
|
|
if2ip_result = Curl_if2ip(af,
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2024-05-17 19:44:44 +08:00
|
|
|
scope, conn->scope_id,
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
2024-05-17 19:44:44 +08:00
|
|
|
iface, myhost, sizeof(myhost));
|
|
|
|
}
|
|
|
|
switch(if2ip_result) {
|
|
|
|
case IF2IP_NOT_FOUND:
|
|
|
|
if(iface_input && !host_input) {
|
2024-07-01 22:47:21 +08:00
|
|
|
/* Do not fall back to treating it as a hostname */
|
2024-05-17 19:44:44 +08:00
|
|
|
failf(data, "Couldn't bind to interface '%s'", iface);
|
|
|
|
return CURLE_INTERFACE_FAILED;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case IF2IP_AF_NOT_SUPPORTED:
|
|
|
|
/* Signal the caller to try another address family if available */
|
|
|
|
return CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
case IF2IP_FOUND:
|
|
|
|
/*
|
|
|
|
* We now have the numerical IP address in the 'myhost' buffer
|
|
|
|
*/
|
|
|
|
host = myhost;
|
|
|
|
infof(data, "Local Interface %s is ip %s using address family %i",
|
|
|
|
iface, host, af);
|
|
|
|
done = 1;
|
|
|
|
break;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
2024-05-17 19:44:44 +08:00
|
|
|
if(!iface_input || host_input) {
|
2022-12-30 16:14:55 +08:00
|
|
|
/*
|
2024-07-01 22:47:21 +08:00
|
|
|
* This was not an interface, resolve the name as a hostname
|
2022-12-30 16:14:55 +08:00
|
|
|
* or IP number
|
|
|
|
*
|
|
|
|
* Temporarily force name resolution to use only the address type
|
|
|
|
* of the connection. The resolve functions should really be changed
|
|
|
|
* to take a type parameter instead.
|
|
|
|
*/
|
|
|
|
unsigned char ipver = conn->ip_version;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
if(af == AF_INET)
|
|
|
|
conn->ip_version = CURL_IPRESOLVE_V4;
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
else if(af == AF_INET6)
|
|
|
|
conn->ip_version = CURL_IPRESOLVE_V6;
|
|
|
|
#endif
|
|
|
|
|
2024-05-17 19:44:44 +08:00
|
|
|
rc = Curl_resolv(data, host, 80, FALSE, &h);
|
2022-12-30 16:14:55 +08:00
|
|
|
if(rc == CURLRESOLV_PENDING)
|
|
|
|
(void)Curl_resolver_wait_resolv(data, &h);
|
|
|
|
conn->ip_version = ipver;
|
|
|
|
|
|
|
|
if(h) {
|
|
|
|
/* convert the resolved address, sizeof myhost >= INET_ADDRSTRLEN */
|
|
|
|
Curl_printable_address(h->addr, myhost, sizeof(myhost));
|
|
|
|
infof(data, "Name '%s' family %i resolved to '%s' family %i",
|
2024-05-17 19:44:44 +08:00
|
|
|
host, af, myhost, h->addr->ai_family);
|
2022-12-30 16:14:55 +08:00
|
|
|
Curl_resolv_unlock(data, h);
|
|
|
|
if(af != h->addr->ai_family) {
|
|
|
|
/* bad IP version combo, signal the caller to try another address
|
|
|
|
family if available */
|
|
|
|
return CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
}
|
|
|
|
done = 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* provided dev was no interface (or interfaces are not supported
|
|
|
|
* e.g. solaris) no ip address and no domain we fail here
|
|
|
|
*/
|
|
|
|
done = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(done > 0) {
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
/* IPv6 address */
|
|
|
|
if(af == AF_INET6) {
|
|
|
|
#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
|
|
|
|
char *scope_ptr = strchr(myhost, '%');
|
|
|
|
if(scope_ptr)
|
|
|
|
*(scope_ptr++) = '\0';
|
|
|
|
#endif
|
|
|
|
if(Curl_inet_pton(AF_INET6, myhost, &si6->sin6_addr) > 0) {
|
|
|
|
si6->sin6_family = AF_INET6;
|
|
|
|
si6->sin6_port = htons(port);
|
|
|
|
#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
|
|
|
|
if(scope_ptr) {
|
|
|
|
/* The "myhost" string either comes from Curl_if2ip or from
|
|
|
|
Curl_printable_address. The latter returns only numeric scope
|
2024-07-01 22:47:21 +08:00
|
|
|
IDs and the former returns none at all. So the scope ID, if
|
2022-12-30 16:14:55 +08:00
|
|
|
present, is known to be numeric */
|
|
|
|
unsigned long scope_id = strtoul(scope_ptr, NULL, 10);
|
|
|
|
if(scope_id > UINT_MAX)
|
|
|
|
return CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
|
|
|
|
si6->sin6_scope_id = (unsigned int)scope_id;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
sizeof_sa = sizeof(struct sockaddr_in6);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
/* IPv4 address */
|
|
|
|
if((af == AF_INET) &&
|
|
|
|
(Curl_inet_pton(AF_INET, myhost, &si4->sin_addr) > 0)) {
|
|
|
|
si4->sin_family = AF_INET;
|
|
|
|
si4->sin_port = htons(port);
|
|
|
|
sizeof_sa = sizeof(struct sockaddr_in);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(done < 1) {
|
|
|
|
/* errorbuf is set false so failf will overwrite any message already in
|
|
|
|
the error buffer, so the user receives this error message instead of a
|
|
|
|
generic resolve error. */
|
|
|
|
data->state.errorbuf = FALSE;
|
2024-05-17 19:44:44 +08:00
|
|
|
failf(data, "Couldn't bind to '%s'", host);
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_INTERFACE_FAILED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* no device was given, prepare sa to match af's needs */
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
if(af == AF_INET6) {
|
|
|
|
si6->sin6_family = AF_INET6;
|
|
|
|
si6->sin6_port = htons(port);
|
|
|
|
sizeof_sa = sizeof(struct sockaddr_in6);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if(af == AF_INET) {
|
|
|
|
si4->sin_family = AF_INET;
|
|
|
|
si4->sin_port = htons(port);
|
|
|
|
sizeof_sa = sizeof(struct sockaddr_in);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifdef IP_BIND_ADDRESS_NO_PORT
|
|
|
|
(void)setsockopt(sockfd, SOL_IP, IP_BIND_ADDRESS_NO_PORT, &on, sizeof(on));
|
|
|
|
#endif
|
|
|
|
for(;;) {
|
|
|
|
if(bind(sockfd, sock, sizeof_sa) >= 0) {
|
|
|
|
/* we succeeded to bind */
|
|
|
|
infof(data, "Local port: %hu", port);
|
|
|
|
conn->bits.bound = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(--portnum > 0) {
|
|
|
|
port++; /* try next port */
|
|
|
|
if(port == 0)
|
|
|
|
break;
|
2023-08-03 23:32:25 +08:00
|
|
|
infof(data, "Bind to local port %d failed, trying next", port - 1);
|
2023-08-23 20:47:45 +08:00
|
|
|
/* We reuse/clobber the port variable here below */
|
2022-12-30 16:14:55 +08:00
|
|
|
if(sock->sa_family == AF_INET)
|
|
|
|
si4->sin_port = ntohs(port);
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2022-12-30 16:14:55 +08:00
|
|
|
else
|
|
|
|
si6->sin6_port = ntohs(port);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
{
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
data->state.os_errno = error = SOCKERRNO;
|
|
|
|
failf(data, "bind failed with errno %d: %s",
|
|
|
|
error, Curl_strerror(error, buffer, sizeof(buffer)));
|
|
|
|
}
|
|
|
|
|
|
|
|
return CURLE_INTERFACE_FAILED;
|
|
|
|
}
|
2023-08-17 20:36:30 +08:00
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* verifyconnect() returns TRUE if the connect really has happened.
|
|
|
|
*/
|
|
|
|
static bool verifyconnect(curl_socket_t sockfd, int *error)
|
|
|
|
{
|
|
|
|
bool rc = TRUE;
|
|
|
|
#ifdef SO_ERROR
|
|
|
|
int err = 0;
|
|
|
|
curl_socklen_t errSize = sizeof(err);
|
|
|
|
|
2023-11-22 00:54:49 +08:00
|
|
|
#ifdef _WIN32
|
2022-12-30 16:14:55 +08:00
|
|
|
/*
|
|
|
|
* In October 2003 we effectively nullified this function on Windows due to
|
|
|
|
* problems with it using all CPU in multi-threaded cases.
|
|
|
|
*
|
|
|
|
* In May 2004, we bring it back to offer more info back on connect failures.
|
|
|
|
* Gisle Vanem could reproduce the former problems with this function, but
|
|
|
|
* could avoid them by adding this SleepEx() call below:
|
|
|
|
*
|
2024-07-01 22:47:21 +08:00
|
|
|
* "I do not have Rational Quantify, but the hint from his post was
|
|
|
|
* ntdll::NtRemoveIoCompletion(). I would assume the SleepEx (or maybe
|
2022-12-30 16:14:55 +08:00
|
|
|
* just Sleep(0) would be enough?) would release whatever
|
|
|
|
* mutex/critical-section the ntdll call is waiting on.
|
|
|
|
*
|
|
|
|
* Someone got to verify this on Win-NT 4.0, 2000."
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef _WIN32_WCE
|
|
|
|
Sleep(0);
|
|
|
|
#else
|
|
|
|
SleepEx(0, FALSE);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if(0 != getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (void *)&err, &errSize))
|
|
|
|
err = SOCKERRNO;
|
|
|
|
#ifdef _WIN32_WCE
|
2024-07-01 22:47:21 +08:00
|
|
|
/* Old WinCE versions do not support SO_ERROR */
|
2022-12-30 16:14:55 +08:00
|
|
|
if(WSAENOPROTOOPT == err) {
|
|
|
|
SET_SOCKERRNO(0);
|
|
|
|
err = 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(EBADIOCTL) && defined(__minix)
|
2024-07-01 22:47:21 +08:00
|
|
|
/* Minix 3.1.x does not support getsockopt on UDP sockets */
|
2022-12-30 16:14:55 +08:00
|
|
|
if(EBADIOCTL == err) {
|
|
|
|
SET_SOCKERRNO(0);
|
|
|
|
err = 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if((0 == err) || (EISCONN == err))
|
|
|
|
/* we are connected, awesome! */
|
|
|
|
rc = TRUE;
|
|
|
|
else
|
2024-07-01 22:47:21 +08:00
|
|
|
/* This was not a successful connect */
|
2022-12-30 16:14:55 +08:00
|
|
|
rc = FALSE;
|
|
|
|
if(error)
|
|
|
|
*error = err;
|
|
|
|
#else
|
|
|
|
(void)sockfd;
|
|
|
|
if(error)
|
|
|
|
*error = SOCKERRNO;
|
|
|
|
#endif
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2023-05-22 15:00:16 +08:00
|
|
|
/**
|
|
|
|
* Determine the curl code for a socket connect() == -1 with errno.
|
|
|
|
*/
|
|
|
|
static CURLcode socket_connect_result(struct Curl_easy *data,
|
|
|
|
const char *ipaddress, int error)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
switch(error) {
|
|
|
|
case EINPROGRESS:
|
|
|
|
case EWOULDBLOCK:
|
|
|
|
#if defined(EAGAIN)
|
|
|
|
#if (EAGAIN) != (EWOULDBLOCK)
|
|
|
|
/* On some platforms EAGAIN and EWOULDBLOCK are the
|
|
|
|
* same value, and on others they are different, hence
|
|
|
|
* the odd #if
|
|
|
|
*/
|
|
|
|
case EAGAIN:
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
return CURLE_OK;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* unknown error, fallthrough and try another address! */
|
2023-08-17 20:18:06 +08:00
|
|
|
#ifdef CURL_DISABLE_VERBOSE_STRINGS
|
|
|
|
(void)ipaddress;
|
|
|
|
#else
|
|
|
|
{
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
infof(data, "Immediate connect fail for %s: %s",
|
|
|
|
ipaddress, Curl_strerror(error, buffer, sizeof(buffer)));
|
|
|
|
}
|
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
data->state.os_errno = error;
|
|
|
|
/* connect failed */
|
|
|
|
return CURLE_COULDNT_CONNECT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-03-30 19:25:20 +08:00
|
|
|
/* We have a recv buffer to enhance reads with len < NW_SMALL_READS.
|
2023-05-22 05:27:43 +08:00
|
|
|
* This happens often on TLS connections where the TLS implementation
|
2023-03-30 19:25:20 +08:00
|
|
|
* tries to read the head of a TLS record, determine the length of the
|
|
|
|
* full record and then make a subsequent read for that.
|
|
|
|
* On large reads, we will not fill the buffer to avoid the double copy. */
|
|
|
|
#define NW_RECV_CHUNK_SIZE (64 * 1024)
|
|
|
|
#define NW_RECV_CHUNKS 1
|
|
|
|
#define NW_SMALL_READS (1024)
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
struct cf_socket_ctx {
|
|
|
|
int transport;
|
2023-01-03 20:13:37 +08:00
|
|
|
struct Curl_sockaddr_ex addr; /* address to connect to */
|
2022-12-30 16:14:55 +08:00
|
|
|
curl_socket_t sock; /* current attempt socket */
|
2023-03-30 19:25:20 +08:00
|
|
|
struct bufq recvbuf; /* used when `buffer_recv` is set */
|
2024-03-08 17:45:14 +08:00
|
|
|
struct ip_quadruple ip; /* The IP quadruple 2x(addr+port) */
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
struct curltime started_at; /* when socket was created */
|
|
|
|
struct curltime connected_at; /* when socket connected/got first byte */
|
|
|
|
struct curltime first_byte_at; /* when first byte was recvd */
|
2024-05-24 16:09:32 +08:00
|
|
|
#ifdef USE_WINSOCK
|
2024-05-27 02:56:24 +08:00
|
|
|
struct curltime last_sndbuf_query_at; /* when SO_SNDBUF last queried */
|
|
|
|
ULONG sndbuf_size; /* the last set SO_SNDBUF size */
|
2024-05-24 16:09:32 +08:00
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
int error; /* errno of last failure or 0 */
|
2023-08-29 19:08:35 +08:00
|
|
|
#ifdef DEBUGBUILD
|
|
|
|
int wblock_percent; /* percent of writes doing EAGAIN */
|
|
|
|
int wpartial_percent; /* percent of bytes written in send */
|
2023-10-05 16:05:12 +08:00
|
|
|
int rblock_percent; /* percent of reads doing EAGAIN */
|
|
|
|
size_t recv_max; /* max enforced read size */
|
2023-08-29 19:08:35 +08:00
|
|
|
#endif
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
BIT(got_first_byte); /* if first byte was received */
|
2022-12-30 16:14:55 +08:00
|
|
|
BIT(accepted); /* socket was accepted, not connected */
|
2024-01-09 20:21:02 +08:00
|
|
|
BIT(sock_connected); /* socket is "connected", e.g. in UDP */
|
2022-12-30 16:14:55 +08:00
|
|
|
BIT(active);
|
2023-03-30 19:25:20 +08:00
|
|
|
BIT(buffer_recv);
|
2022-12-30 16:14:55 +08:00
|
|
|
};
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
static void cf_socket_ctx_init(struct cf_socket_ctx *ctx,
|
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
int transport)
|
|
|
|
{
|
|
|
|
memset(ctx, 0, sizeof(*ctx));
|
|
|
|
ctx->sock = CURL_SOCKET_BAD;
|
|
|
|
ctx->transport = transport;
|
2023-05-25 17:03:56 +08:00
|
|
|
Curl_sock_assign_addr(&ctx->addr, ai, transport);
|
2023-03-30 19:25:20 +08:00
|
|
|
Curl_bufq_init(&ctx->recvbuf, NW_RECV_CHUNK_SIZE, NW_RECV_CHUNKS);
|
2023-08-29 19:08:35 +08:00
|
|
|
#ifdef DEBUGBUILD
|
|
|
|
{
|
|
|
|
char *p = getenv("CURL_DBG_SOCK_WBLOCK");
|
|
|
|
if(p) {
|
|
|
|
long l = strtol(p, NULL, 10);
|
|
|
|
if(l >= 0 && l <= 100)
|
|
|
|
ctx->wblock_percent = (int)l;
|
|
|
|
}
|
|
|
|
p = getenv("CURL_DBG_SOCK_WPARTIAL");
|
|
|
|
if(p) {
|
|
|
|
long l = strtol(p, NULL, 10);
|
|
|
|
if(l >= 0 && l <= 100)
|
|
|
|
ctx->wpartial_percent = (int)l;
|
|
|
|
}
|
2023-10-05 16:05:12 +08:00
|
|
|
p = getenv("CURL_DBG_SOCK_RBLOCK");
|
|
|
|
if(p) {
|
|
|
|
long l = strtol(p, NULL, 10);
|
|
|
|
if(l >= 0 && l <= 100)
|
|
|
|
ctx->rblock_percent = (int)l;
|
|
|
|
}
|
|
|
|
p = getenv("CURL_DBG_SOCK_RMAX");
|
|
|
|
if(p) {
|
|
|
|
long l = strtol(p, NULL, 10);
|
|
|
|
if(l >= 0)
|
|
|
|
ctx->recv_max = (size_t)l;
|
|
|
|
}
|
2023-08-29 19:08:35 +08:00
|
|
|
}
|
|
|
|
#endif
|
2023-03-30 19:25:20 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct reader_ctx {
|
|
|
|
struct Curl_cfilter *cf;
|
|
|
|
struct Curl_easy *data;
|
|
|
|
};
|
|
|
|
|
|
|
|
static ssize_t nw_in_read(void *reader_ctx,
|
|
|
|
unsigned char *buf, size_t len,
|
|
|
|
CURLcode *err)
|
|
|
|
{
|
|
|
|
struct reader_ctx *rctx = reader_ctx;
|
|
|
|
struct cf_socket_ctx *ctx = rctx->cf->ctx;
|
|
|
|
ssize_t nread;
|
|
|
|
|
|
|
|
*err = CURLE_OK;
|
|
|
|
nread = sread(ctx->sock, buf, len);
|
|
|
|
|
|
|
|
if(-1 == nread) {
|
|
|
|
int sockerr = SOCKERRNO;
|
|
|
|
|
|
|
|
if(
|
|
|
|
#ifdef WSAEWOULDBLOCK
|
|
|
|
/* This is how Windows does it */
|
|
|
|
(WSAEWOULDBLOCK == sockerr)
|
|
|
|
#else
|
|
|
|
/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
|
|
|
|
due to its inability to send off data without blocking. We therefore
|
|
|
|
treat both error codes the same here */
|
|
|
|
(EWOULDBLOCK == sockerr) || (EAGAIN == sockerr) || (EINTR == sockerr)
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
/* this is just a case of EWOULDBLOCK */
|
|
|
|
*err = CURLE_AGAIN;
|
|
|
|
nread = -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
|
|
|
|
failf(rctx->data, "Recv failure: %s",
|
|
|
|
Curl_strerror(sockerr, buffer, sizeof(buffer)));
|
|
|
|
rctx->data->state.os_errno = sockerr;
|
|
|
|
*err = CURLE_RECV_ERROR;
|
|
|
|
nread = -1;
|
|
|
|
}
|
|
|
|
}
|
2024-02-09 00:52:29 +08:00
|
|
|
CURL_TRC_CF(rctx->data, rctx->cf, "nw_in_read(len=%zu, fd=%"
|
|
|
|
CURL_FORMAT_SOCKET_T ") -> %d, err=%d",
|
|
|
|
len, ctx->sock, (int)nread, *err);
|
2023-03-30 19:25:20 +08:00
|
|
|
return nread;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static void cf_socket_close(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
if(ctx && CURL_SOCKET_BAD != ctx->sock) {
|
2023-10-26 23:02:45 +08:00
|
|
|
CURL_TRC_CF(data, cf, "cf_socket_close(%" CURL_FORMAT_SOCKET_T
|
|
|
|
")", ctx->sock);
|
|
|
|
if(ctx->sock == cf->conn->sock[cf->sockindex])
|
|
|
|
cf->conn->sock[cf->sockindex] = CURL_SOCKET_BAD;
|
|
|
|
socket_close(data, cf->conn, !ctx->accepted, ctx->sock);
|
|
|
|
ctx->sock = CURL_SOCKET_BAD;
|
|
|
|
if(ctx->active && cf->sockindex == FIRSTSOCKET)
|
|
|
|
cf->conn->remote_addr = NULL;
|
2023-03-30 19:25:20 +08:00
|
|
|
Curl_bufq_reset(&ctx->recvbuf);
|
2022-12-30 16:14:55 +08:00
|
|
|
ctx->active = FALSE;
|
2023-03-30 19:25:20 +08:00
|
|
|
ctx->buffer_recv = FALSE;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
memset(&ctx->started_at, 0, sizeof(ctx->started_at));
|
|
|
|
memset(&ctx->connected_at, 0, sizeof(ctx->connected_at));
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
cf->connected = FALSE;
|
|
|
|
}
|
|
|
|
|
2024-06-07 16:12:39 +08:00
|
|
|
static CURLcode cf_socket_shutdown(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
bool *done)
|
|
|
|
{
|
|
|
|
if(cf->connected) {
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
CURL_TRC_CF(data, cf, "cf_socket_shutdown(%" CURL_FORMAT_SOCKET_T
|
|
|
|
")", ctx->sock);
|
|
|
|
/* On TCP, and when the socket looks well and non-blocking mode
|
|
|
|
* can be enabled, receive dangling bytes before close to avoid
|
|
|
|
* entering RST states unnecessarily. */
|
|
|
|
if(ctx->sock != CURL_SOCKET_BAD &&
|
|
|
|
ctx->transport == TRNSPRT_TCP &&
|
|
|
|
(curlx_nonblock(ctx->sock, TRUE) >= 0)) {
|
|
|
|
unsigned char buf[1024];
|
|
|
|
(void)sread(ctx->sock, buf, sizeof(buf));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static void cf_socket_destroy(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
cf_socket_close(cf, data);
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "destroy");
|
2023-03-30 19:25:20 +08:00
|
|
|
Curl_bufq_free(&ctx->recvbuf);
|
2022-12-30 16:14:55 +08:00
|
|
|
free(ctx);
|
|
|
|
cf->ctx = NULL;
|
|
|
|
}
|
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
static CURLcode set_local_ip(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
#ifdef HAVE_GETSOCKNAME
|
2024-05-10 16:52:58 +08:00
|
|
|
if((ctx->sock != CURL_SOCKET_BAD) &&
|
|
|
|
!(data->conn->handler->protocol & CURLPROTO_TFTP)) {
|
2023-06-18 06:18:12 +08:00
|
|
|
/* TFTP does not connect, so it cannot get the IP like this */
|
2023-01-03 20:13:37 +08:00
|
|
|
|
2023-06-18 06:18:12 +08:00
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
struct Curl_sockaddr_storage ssloc;
|
|
|
|
curl_socklen_t slen = sizeof(struct Curl_sockaddr_storage);
|
|
|
|
|
|
|
|
memset(&ssloc, 0, sizeof(ssloc));
|
|
|
|
if(getsockname(ctx->sock, (struct sockaddr*) &ssloc, &slen)) {
|
|
|
|
int error = SOCKERRNO;
|
|
|
|
failf(data, "getsockname() failed with errno %d: %s",
|
|
|
|
error, Curl_strerror(error, buffer, sizeof(buffer)));
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
}
|
|
|
|
if(!Curl_addr2string((struct sockaddr*)&ssloc, slen,
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.local_ip, &ctx->ip.local_port)) {
|
2023-06-18 06:18:12 +08:00
|
|
|
failf(data, "ssloc inet_ntop() failed with errno %d: %s",
|
|
|
|
errno, Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
}
|
2023-01-03 20:13:37 +08:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void)data;
|
2024-03-28 03:21:19 +08:00
|
|
|
ctx->ip.local_ip[0] = 0;
|
|
|
|
ctx->ip.local_port = -1;
|
2023-01-03 20:13:37 +08:00
|
|
|
#endif
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CURLcode set_remote_ip(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
/* store remote address and port used in this connection attempt */
|
2024-06-03 04:30:52 +08:00
|
|
|
if(!Curl_addr2string(&ctx->addr.sa_addr, (curl_socklen_t)ctx->addr.addrlen,
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.remote_ip, &ctx->ip.remote_port)) {
|
2023-01-03 20:13:37 +08:00
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
|
|
|
|
ctx->error = errno;
|
|
|
|
/* malformed address or bug in inet_ntop, try next address */
|
|
|
|
failf(data, "sa_addr inet_ntop() failed with errno %d: %s",
|
|
|
|
errno, Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
}
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static CURLcode cf_socket_open(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
int error = 0;
|
|
|
|
bool isconnected = FALSE;
|
|
|
|
CURLcode result = CURLE_COULDNT_CONNECT;
|
|
|
|
bool is_tcp;
|
|
|
|
|
|
|
|
(void)data;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
DEBUGASSERT(ctx->sock == CURL_SOCKET_BAD);
|
|
|
|
ctx->started_at = Curl_now();
|
2024-06-02 14:40:42 +08:00
|
|
|
#ifdef SOCK_NONBLOCK
|
2024-07-01 22:47:21 +08:00
|
|
|
/* Do not tuck SOCK_NONBLOCK into socktype when opensocket callback is set
|
|
|
|
* because we would not know how socketype is about to be used in the
|
2024-06-02 14:40:42 +08:00
|
|
|
* callback, SOCK_NONBLOCK might get factored out before calling socket().
|
|
|
|
*/
|
|
|
|
if(!data->set.fopensocket)
|
|
|
|
ctx->addr.socktype |= SOCK_NONBLOCK;
|
|
|
|
#endif
|
2023-01-03 20:13:37 +08:00
|
|
|
result = socket_open(data, &ctx->addr, &ctx->sock);
|
2024-06-02 14:40:42 +08:00
|
|
|
#ifdef SOCK_NONBLOCK
|
|
|
|
/* Restore the socktype after the socket is created. */
|
|
|
|
if(!data->set.fopensocket)
|
|
|
|
ctx->addr.socktype &= ~SOCK_NONBLOCK;
|
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
if(result)
|
|
|
|
goto out;
|
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
result = set_remote_ip(cf, data);
|
|
|
|
if(result)
|
2022-12-30 16:14:55 +08:00
|
|
|
goto out;
|
2023-01-03 20:13:37 +08:00
|
|
|
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2023-12-08 21:05:09 +08:00
|
|
|
if(ctx->addr.family == AF_INET6) {
|
|
|
|
set_ipv6_v6only(ctx->sock, 0);
|
2024-03-08 17:45:14 +08:00
|
|
|
infof(data, " Trying [%s]:%d...", ctx->ip.remote_ip, ctx->ip.remote_port);
|
2023-04-15 23:08:40 +08:00
|
|
|
}
|
2023-12-08 21:05:09 +08:00
|
|
|
else
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
2024-03-08 17:45:14 +08:00
|
|
|
infof(data, " Trying %s:%d...", ctx->ip.remote_ip, ctx->ip.remote_port);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2023-01-03 20:13:37 +08:00
|
|
|
is_tcp = (ctx->addr.family == AF_INET
|
|
|
|
|| ctx->addr.family == AF_INET6) &&
|
|
|
|
ctx->addr.socktype == SOCK_STREAM;
|
2022-12-30 16:14:55 +08:00
|
|
|
#else
|
2023-01-03 20:13:37 +08:00
|
|
|
is_tcp = (ctx->addr.family == AF_INET) &&
|
|
|
|
ctx->addr.socktype == SOCK_STREAM;
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
|
|
|
if(is_tcp && data->set.tcp_nodelay)
|
|
|
|
tcpnodelay(data, ctx->sock);
|
|
|
|
|
|
|
|
nosigpipe(data, ctx->sock);
|
|
|
|
|
2024-05-27 02:56:24 +08:00
|
|
|
Curl_sndbuf_init(ctx->sock);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
if(is_tcp && data->set.tcp_keepalive)
|
|
|
|
tcpkeepalive(data, ctx->sock);
|
|
|
|
|
|
|
|
if(data->set.fsockopt) {
|
|
|
|
/* activate callback for setting socket options */
|
|
|
|
Curl_set_in_callback(data, true);
|
|
|
|
error = data->set.fsockopt(data->set.sockopt_client,
|
|
|
|
ctx->sock,
|
|
|
|
CURLSOCKTYPE_IPCXN);
|
|
|
|
Curl_set_in_callback(data, false);
|
|
|
|
|
|
|
|
if(error == CURL_SOCKOPT_ALREADY_CONNECTED)
|
|
|
|
isconnected = TRUE;
|
|
|
|
else if(error) {
|
|
|
|
result = CURLE_ABORTED_BY_CALLBACK;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-08-17 20:36:30 +08:00
|
|
|
#ifndef CURL_DISABLE_BINDLOCAL
|
2022-12-30 16:14:55 +08:00
|
|
|
/* possibly bind the local end to an IP, interface or port */
|
2023-01-03 20:13:37 +08:00
|
|
|
if(ctx->addr.family == AF_INET
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2023-01-03 20:13:37 +08:00
|
|
|
|| ctx->addr.family == AF_INET6
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
|
|
|
) {
|
2023-01-03 20:13:37 +08:00
|
|
|
result = bindlocal(data, cf->conn, ctx->sock, ctx->addr.family,
|
|
|
|
Curl_ipv6_scope(&ctx->addr.sa_addr));
|
2022-12-30 16:14:55 +08:00
|
|
|
if(result) {
|
|
|
|
if(result == CURLE_UNSUPPORTED_PROTOCOL) {
|
|
|
|
/* The address family is not supported on this interface.
|
|
|
|
We can continue trying addresses */
|
|
|
|
result = CURLE_COULDNT_CONNECT;
|
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2023-08-17 20:36:30 +08:00
|
|
|
#endif
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2024-06-02 14:40:42 +08:00
|
|
|
#ifndef SOCK_NONBLOCK
|
2024-06-13 21:28:01 +08:00
|
|
|
/* Set socket non-blocking, must be a non-blocking socket for
|
|
|
|
* a non-blocking connect. */
|
|
|
|
error = curlx_nonblock(ctx->sock, TRUE);
|
|
|
|
if(error < 0) {
|
|
|
|
result = CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
ctx->error = SOCKERRNO;
|
|
|
|
goto out;
|
|
|
|
}
|
2024-06-02 14:40:42 +08:00
|
|
|
#else
|
2024-06-13 21:28:01 +08:00
|
|
|
if(data->set.fopensocket) {
|
|
|
|
/* Set socket non-blocking, must be a non-blocking socket for
|
|
|
|
* a non-blocking connect. */
|
|
|
|
error = curlx_nonblock(ctx->sock, TRUE);
|
|
|
|
if(error < 0) {
|
|
|
|
result = CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
ctx->error = SOCKERRNO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2024-06-02 14:40:42 +08:00
|
|
|
#endif
|
2024-01-09 20:21:02 +08:00
|
|
|
ctx->sock_connected = (ctx->addr.socktype != SOCK_DGRAM);
|
2022-12-30 16:14:55 +08:00
|
|
|
out:
|
|
|
|
if(result) {
|
|
|
|
if(ctx->sock != CURL_SOCKET_BAD) {
|
|
|
|
socket_close(data, cf->conn, TRUE, ctx->sock);
|
|
|
|
ctx->sock = CURL_SOCKET_BAD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(isconnected) {
|
2023-01-03 20:13:37 +08:00
|
|
|
set_local_ip(cf, data);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
ctx->connected_at = Curl_now();
|
2022-12-30 16:14:55 +08:00
|
|
|
cf->connected = TRUE;
|
|
|
|
}
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "cf_socket_open() -> %d, fd=%" CURL_FORMAT_SOCKET_T,
|
|
|
|
result, ctx->sock);
|
2022-12-30 16:14:55 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
static int do_connect(struct Curl_cfilter *cf, struct Curl_easy *data,
|
|
|
|
bool is_tcp_fastopen)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
#ifdef TCP_FASTOPEN_CONNECT
|
|
|
|
int optval = 1;
|
|
|
|
#endif
|
|
|
|
int rc = -1;
|
|
|
|
|
|
|
|
(void)data;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
if(is_tcp_fastopen) {
|
2022-12-30 16:14:55 +08:00
|
|
|
#if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */
|
|
|
|
# if defined(HAVE_BUILTIN_AVAILABLE)
|
|
|
|
/* while connectx function is available since macOS 10.11 / iOS 9,
|
|
|
|
it did not have the interface declared correctly until
|
|
|
|
Xcode 9 / macOS SDK 10.13 */
|
|
|
|
if(__builtin_available(macOS 10.11, iOS 9.0, tvOS 9.0, watchOS 2.0, *)) {
|
|
|
|
sa_endpoints_t endpoints;
|
|
|
|
endpoints.sae_srcif = 0;
|
|
|
|
endpoints.sae_srcaddr = NULL;
|
|
|
|
endpoints.sae_srcaddrlen = 0;
|
2023-01-03 20:13:37 +08:00
|
|
|
endpoints.sae_dstaddr = &ctx->addr.sa_addr;
|
|
|
|
endpoints.sae_dstaddrlen = ctx->addr.addrlen;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
rc = connectx(ctx->sock, &endpoints, SAE_ASSOCID_ANY,
|
|
|
|
CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT,
|
|
|
|
NULL, 0, NULL, NULL);
|
|
|
|
}
|
|
|
|
else {
|
2023-01-03 20:13:37 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr, ctx->addr.addrlen);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
# else
|
2023-01-03 20:13:37 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr, ctx->addr.addrlen);
|
2022-12-30 16:14:55 +08:00
|
|
|
# endif /* HAVE_BUILTIN_AVAILABLE */
|
|
|
|
#elif defined(TCP_FASTOPEN_CONNECT) /* Linux >= 4.11 */
|
|
|
|
if(setsockopt(ctx->sock, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
|
|
|
|
(void *)&optval, sizeof(optval)) < 0)
|
2023-03-28 22:46:03 +08:00
|
|
|
infof(data, "Failed to enable TCP Fast Open on fd %"
|
|
|
|
CURL_FORMAT_SOCKET_T, ctx->sock);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-03 20:13:37 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr, ctx->addr.addrlen);
|
2022-12-30 16:14:55 +08:00
|
|
|
#elif defined(MSG_FASTOPEN) /* old Linux */
|
2023-01-01 23:32:13 +08:00
|
|
|
if(cf->conn->given->flags & PROTOPT_SSL)
|
2023-01-03 20:13:37 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr, ctx->addr.addrlen);
|
2022-12-30 16:14:55 +08:00
|
|
|
else
|
|
|
|
rc = 0; /* Do nothing */
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
2024-06-03 04:30:52 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr,
|
|
|
|
(curl_socklen_t)ctx->addr.addrlen);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CURLcode cf_tcp_connect(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
bool blocking, bool *done)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
CURLcode result = CURLE_COULDNT_CONNECT;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
(void)data;
|
|
|
|
if(cf->connected) {
|
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: need to support blocking connect? */
|
|
|
|
if(blocking)
|
|
|
|
return CURLE_UNSUPPORTED_PROTOCOL;
|
|
|
|
|
|
|
|
*done = FALSE; /* a very negative world view is best */
|
|
|
|
if(ctx->sock == CURL_SOCKET_BAD) {
|
2023-11-29 22:17:30 +08:00
|
|
|
int error;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
result = cf_socket_open(cf, data);
|
|
|
|
if(result)
|
|
|
|
goto out;
|
|
|
|
|
2023-03-01 17:02:08 +08:00
|
|
|
if(cf->connected) {
|
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
/* Connect TCP socket */
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
rc = do_connect(cf, data, cf->conn->bits.tcp_fastopen);
|
2023-11-29 22:17:30 +08:00
|
|
|
error = SOCKERRNO;
|
|
|
|
set_local_ip(cf, data);
|
|
|
|
CURL_TRC_CF(data, cf, "local address %s port %d...",
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.local_ip, ctx->ip.local_port);
|
2022-12-30 16:14:55 +08:00
|
|
|
if(-1 == rc) {
|
2024-03-08 17:45:14 +08:00
|
|
|
result = socket_connect_result(data, ctx->ip.remote_ip, error);
|
2022-12-30 16:14:55 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef mpeix
|
|
|
|
/* Call this function once now, and ignore the results. We do this to
|
|
|
|
"clear" the error state on the socket so that we can later read it
|
|
|
|
reliably. This is reported necessary on the MPE/iX operating
|
|
|
|
system. */
|
|
|
|
(void)verifyconnect(ctx->sock, NULL);
|
|
|
|
#endif
|
|
|
|
/* check socket for connect */
|
|
|
|
rc = SOCKET_WRITABLE(ctx->sock, 0);
|
|
|
|
|
|
|
|
if(rc == 0) { /* no connection yet */
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "not connected yet");
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
else if(rc == CURL_CSELECT_OUT || cf->conn->bits.tcp_fastopen) {
|
|
|
|
if(verifyconnect(ctx->sock, &ctx->error)) {
|
|
|
|
/* we are connected with TCP, awesome! */
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
ctx->connected_at = Curl_now();
|
2023-01-03 20:13:37 +08:00
|
|
|
set_local_ip(cf, data);
|
2022-12-30 16:14:55 +08:00
|
|
|
*done = TRUE;
|
|
|
|
cf->connected = TRUE;
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connected");
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(rc & CURL_CSELECT_ERR) {
|
|
|
|
(void)verifyconnect(ctx->sock, &ctx->error);
|
|
|
|
result = CURLE_COULDNT_CONNECT;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if(result) {
|
|
|
|
if(ctx->error) {
|
2023-11-29 22:17:30 +08:00
|
|
|
set_local_ip(cf, data);
|
2022-12-30 16:14:55 +08:00
|
|
|
data->state.os_errno = ctx->error;
|
|
|
|
SET_SOCKERRNO(ctx->error);
|
|
|
|
#ifndef CURL_DISABLE_VERBOSE_STRINGS
|
|
|
|
{
|
|
|
|
char buffer[STRERROR_LEN];
|
2023-11-29 22:17:30 +08:00
|
|
|
infof(data, "connect to %s port %u from %s port %d failed: %s",
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.remote_ip, ctx->ip.remote_port,
|
|
|
|
ctx->ip.local_ip, ctx->ip.local_port,
|
2022-12-30 16:14:55 +08:00
|
|
|
Curl_strerror(ctx->error, buffer, sizeof(buffer)));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
if(ctx->sock != CURL_SOCKET_BAD) {
|
|
|
|
socket_close(data, cf->conn, TRUE, ctx->sock);
|
|
|
|
ctx->sock = CURL_SOCKET_BAD;
|
|
|
|
}
|
|
|
|
*done = FALSE;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cf_socket_get_host(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
const char **phost,
|
|
|
|
const char **pdisplay_host,
|
|
|
|
int *pport)
|
|
|
|
{
|
2024-03-08 17:45:14 +08:00
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
2022-12-30 16:14:55 +08:00
|
|
|
(void)data;
|
|
|
|
*phost = cf->conn->host.name;
|
|
|
|
*pdisplay_host = cf->conn->host.dispname;
|
2024-03-08 17:45:14 +08:00
|
|
|
*pport = ctx->ip.remote_port;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
static void cf_socket_adjust_pollset(struct Curl_cfilter *cf,
|
2022-12-30 16:14:55 +08:00
|
|
|
struct Curl_easy *data,
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
struct easy_pollset *ps)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
if(ctx->sock != CURL_SOCKET_BAD) {
|
2024-01-09 20:21:02 +08:00
|
|
|
if(!cf->connected) {
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
Curl_pollset_set_out_only(data, ps, ctx->sock);
|
2024-02-09 00:52:29 +08:00
|
|
|
CURL_TRC_CF(data, cf, "adjust_pollset, !connected, POLLOUT fd=%"
|
|
|
|
CURL_FORMAT_SOCKET_T, ctx->sock);
|
2024-01-09 20:21:02 +08:00
|
|
|
}
|
|
|
|
else if(!ctx->active) {
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
Curl_pollset_add_in(data, ps, ctx->sock);
|
2024-02-09 00:52:29 +08:00
|
|
|
CURL_TRC_CF(data, cf, "adjust_pollset, !active, POLLIN fd=%"
|
|
|
|
CURL_FORMAT_SOCKET_T, ctx->sock);
|
2024-01-09 20:21:02 +08:00
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool cf_socket_data_pending(struct Curl_cfilter *cf,
|
|
|
|
const struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
int readable;
|
|
|
|
|
2023-03-30 19:25:20 +08:00
|
|
|
(void)data;
|
|
|
|
if(!Curl_bufq_is_empty(&ctx->recvbuf))
|
2023-04-29 00:07:33 +08:00
|
|
|
return TRUE;
|
2023-01-30 23:03:00 +08:00
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
readable = SOCKET_READABLE(ctx->sock, 0);
|
|
|
|
return (readable > 0 && (readable & CURL_CSELECT_IN));
|
|
|
|
}
|
|
|
|
|
2024-05-27 02:56:24 +08:00
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
|
|
|
|
#ifndef SIO_IDEAL_SEND_BACKLOG_QUERY
|
|
|
|
#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747B
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void win_update_sndbuf_size(struct cf_socket_ctx *ctx)
|
|
|
|
{
|
|
|
|
ULONG ideal;
|
|
|
|
DWORD ideallen;
|
|
|
|
struct curltime n = Curl_now();
|
|
|
|
|
|
|
|
if(Curl_timediff(n, ctx->last_sndbuf_query_at) > 1000) {
|
|
|
|
if(!WSAIoctl(ctx->sock, SIO_IDEAL_SEND_BACKLOG_QUERY, 0, 0,
|
|
|
|
&ideal, sizeof(ideal), &ideallen, 0, 0) &&
|
|
|
|
ideal != ctx->sndbuf_size &&
|
|
|
|
!setsockopt(ctx->sock, SOL_SOCKET, SO_SNDBUF,
|
|
|
|
(const char *)&ideal, sizeof(ideal))) {
|
|
|
|
ctx->sndbuf_size = ideal;
|
|
|
|
}
|
|
|
|
ctx->last_sndbuf_query_at = n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static ssize_t cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
|
|
|
|
const void *buf, size_t len, CURLcode *err)
|
|
|
|
{
|
2023-01-30 23:03:00 +08:00
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
curl_socket_t fdsave;
|
2022-12-30 16:14:55 +08:00
|
|
|
ssize_t nwritten;
|
2023-08-29 19:08:35 +08:00
|
|
|
size_t orig_len = len;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-03-30 19:25:20 +08:00
|
|
|
*err = CURLE_OK;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
fdsave = cf->conn->sock[cf->sockindex];
|
|
|
|
cf->conn->sock[cf->sockindex] = ctx->sock;
|
|
|
|
|
2023-08-29 19:08:35 +08:00
|
|
|
#ifdef DEBUGBUILD
|
|
|
|
/* simulate network blocking/partial writes */
|
|
|
|
if(ctx->wblock_percent > 0) {
|
2024-05-12 05:38:25 +08:00
|
|
|
unsigned char c = 0;
|
2023-08-29 19:08:35 +08:00
|
|
|
Curl_rand(data, &c, 1);
|
|
|
|
if(c >= ((100-ctx->wblock_percent)*256/100)) {
|
|
|
|
CURL_TRC_CF(data, cf, "send(len=%zu) SIMULATE EWOULDBLOCK", orig_len);
|
|
|
|
*err = CURLE_AGAIN;
|
|
|
|
nwritten = -1;
|
|
|
|
cf->conn->sock[cf->sockindex] = fdsave;
|
|
|
|
return nwritten;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(cf->cft != &Curl_cft_udp && ctx->wpartial_percent > 0 && len > 8) {
|
|
|
|
len = len * ctx->wpartial_percent / 100;
|
|
|
|
if(!len)
|
|
|
|
len = 1;
|
|
|
|
CURL_TRC_CF(data, cf, "send(len=%zu) SIMULATE partial write of %zu bytes",
|
|
|
|
orig_len, len);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2023-01-30 23:03:00 +08:00
|
|
|
#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */
|
|
|
|
if(cf->conn->bits.tcp_fastopen) {
|
2023-01-31 20:48:30 +08:00
|
|
|
nwritten = sendto(ctx->sock, buf, len, MSG_FASTOPEN,
|
|
|
|
&cf->conn->remote_addr->sa_addr,
|
|
|
|
cf->conn->remote_addr->addrlen);
|
2023-01-30 23:03:00 +08:00
|
|
|
cf->conn->bits.tcp_fastopen = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
nwritten = swrite(ctx->sock, buf, len);
|
|
|
|
|
|
|
|
if(-1 == nwritten) {
|
|
|
|
int sockerr = SOCKERRNO;
|
|
|
|
|
|
|
|
if(
|
|
|
|
#ifdef WSAEWOULDBLOCK
|
|
|
|
/* This is how Windows does it */
|
|
|
|
(WSAEWOULDBLOCK == sockerr)
|
|
|
|
#else
|
|
|
|
/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
|
|
|
|
due to its inability to send off data without blocking. We therefore
|
|
|
|
treat both error codes the same here */
|
|
|
|
(EWOULDBLOCK == sockerr) || (EAGAIN == sockerr) || (EINTR == sockerr) ||
|
|
|
|
(EINPROGRESS == sockerr)
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
/* this is just a case of EWOULDBLOCK */
|
|
|
|
*err = CURLE_AGAIN;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
failf(data, "Send failure: %s",
|
|
|
|
Curl_strerror(sockerr, buffer, sizeof(buffer)));
|
|
|
|
data->state.os_errno = sockerr;
|
|
|
|
*err = CURLE_SEND_ERROR;
|
|
|
|
}
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
|
2024-05-24 16:09:32 +08:00
|
|
|
#if defined(USE_WINSOCK)
|
2024-05-27 02:56:24 +08:00
|
|
|
if(!*err)
|
|
|
|
win_update_sndbuf_size(ctx);
|
2024-05-24 16:09:32 +08:00
|
|
|
#endif
|
|
|
|
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "send(len=%zu) -> %d, err=%d",
|
2023-08-29 19:08:35 +08:00
|
|
|
orig_len, (int)nwritten, *err);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf->conn->sock[cf->sockindex] = fdsave;
|
2022-12-30 16:14:55 +08:00
|
|
|
return nwritten;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
|
|
|
char *buf, size_t len, CURLcode *err)
|
|
|
|
{
|
2023-01-30 23:03:00 +08:00
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
curl_socket_t fdsave;
|
2022-12-30 16:14:55 +08:00
|
|
|
ssize_t nread;
|
|
|
|
|
2023-01-30 23:03:00 +08:00
|
|
|
*err = CURLE_OK;
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
fdsave = cf->conn->sock[cf->sockindex];
|
|
|
|
cf->conn->sock[cf->sockindex] = ctx->sock;
|
|
|
|
|
2023-10-05 16:05:12 +08:00
|
|
|
#ifdef DEBUGBUILD
|
|
|
|
/* simulate network blocking/partial reads */
|
|
|
|
if(cf->cft != &Curl_cft_udp && ctx->rblock_percent > 0) {
|
2024-05-12 05:38:25 +08:00
|
|
|
unsigned char c = 0;
|
2023-10-05 16:05:12 +08:00
|
|
|
Curl_rand(data, &c, 1);
|
|
|
|
if(c >= ((100-ctx->rblock_percent)*256/100)) {
|
|
|
|
CURL_TRC_CF(data, cf, "recv(len=%zu) SIMULATE EWOULDBLOCK", len);
|
|
|
|
*err = CURLE_AGAIN;
|
|
|
|
nread = -1;
|
|
|
|
cf->conn->sock[cf->sockindex] = fdsave;
|
|
|
|
return nread;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(cf->cft != &Curl_cft_udp && ctx->recv_max && ctx->recv_max < len) {
|
|
|
|
size_t orig_len = len;
|
|
|
|
len = ctx->recv_max;
|
|
|
|
CURL_TRC_CF(data, cf, "recv(len=%zu) SIMULATE max read of %zu bytes",
|
|
|
|
orig_len, len);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2023-03-30 19:25:20 +08:00
|
|
|
if(ctx->buffer_recv && !Curl_bufq_is_empty(&ctx->recvbuf)) {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "recv from buffer");
|
2023-03-30 19:25:20 +08:00
|
|
|
nread = Curl_bufq_read(&ctx->recvbuf, (unsigned char *)buf, len, err);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
struct reader_ctx rctx;
|
|
|
|
|
|
|
|
rctx.cf = cf;
|
|
|
|
rctx.data = data;
|
|
|
|
|
|
|
|
/* "small" reads may trigger filling our buffer, "large" reads
|
|
|
|
* are probably not worth the additional copy */
|
|
|
|
if(ctx->buffer_recv && len < NW_SMALL_READS) {
|
|
|
|
ssize_t nwritten;
|
|
|
|
nwritten = Curl_bufq_slurp(&ctx->recvbuf, nw_in_read, &rctx, err);
|
|
|
|
if(nwritten < 0 && !Curl_bufq_is_empty(&ctx->recvbuf)) {
|
|
|
|
/* we have a partial read with an error. need to deliver
|
|
|
|
* what we got, return the error later. */
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "partial read: empty buffer first");
|
2023-03-30 19:25:20 +08:00
|
|
|
nread = Curl_bufq_read(&ctx->recvbuf, (unsigned char *)buf, len, err);
|
|
|
|
}
|
|
|
|
else if(nwritten < 0) {
|
|
|
|
nread = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else if(nwritten == 0) {
|
|
|
|
/* eof */
|
|
|
|
*err = CURLE_OK;
|
|
|
|
nread = 0;
|
|
|
|
}
|
|
|
|
else {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "buffered %zd additional bytes", nwritten);
|
2023-03-30 19:25:20 +08:00
|
|
|
nread = Curl_bufq_read(&ctx->recvbuf, (unsigned char *)buf, len, err);
|
|
|
|
}
|
2023-01-30 23:03:00 +08:00
|
|
|
}
|
|
|
|
else {
|
2023-03-30 19:25:20 +08:00
|
|
|
nread = nw_in_read(&rctx, (unsigned char *)buf, len, err);
|
2023-01-30 23:03:00 +08:00
|
|
|
}
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
|
2023-03-30 19:25:20 +08:00
|
|
|
out:
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "recv(len=%zu) -> %d, err=%d", len, (int)nread,
|
|
|
|
*err);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
if(nread > 0 && !ctx->got_first_byte) {
|
|
|
|
ctx->first_byte_at = Curl_now();
|
|
|
|
ctx->got_first_byte = TRUE;
|
|
|
|
}
|
|
|
|
cf->conn->sock[cf->sockindex] = fdsave;
|
2022-12-30 16:14:55 +08:00
|
|
|
return nread;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cf_socket_active(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
/* use this socket from now on */
|
|
|
|
cf->conn->sock[cf->sockindex] = ctx->sock;
|
2024-03-08 17:45:14 +08:00
|
|
|
set_local_ip(cf, data);
|
|
|
|
if(cf->sockindex == SECONDARYSOCKET)
|
|
|
|
cf->conn->secondary = ctx->ip;
|
|
|
|
else
|
|
|
|
cf->conn->primary = ctx->ip;
|
|
|
|
/* the first socket info gets some specials */
|
2022-12-30 16:14:55 +08:00
|
|
|
if(cf->sockindex == FIRSTSOCKET) {
|
2023-01-03 20:13:37 +08:00
|
|
|
cf->conn->remote_addr = &ctx->addr;
|
2024-04-11 20:01:58 +08:00
|
|
|
#ifdef USE_IPV6
|
2023-01-03 20:13:37 +08:00
|
|
|
cf->conn->bits.ipv6 = (ctx->addr.family == AF_INET6)? TRUE : FALSE;
|
2022-12-30 16:14:55 +08:00
|
|
|
#endif
|
2024-03-08 17:45:14 +08:00
|
|
|
Curl_persistconninfo(data, cf->conn, &ctx->ip);
|
2023-05-16 16:24:07 +08:00
|
|
|
/* buffering is currently disabled by default because we have stalls
|
2023-04-13 23:46:52 +08:00
|
|
|
* in parallel transfers where not all buffered data is consumed and no
|
|
|
|
* socket events happen.
|
|
|
|
*/
|
|
|
|
ctx->buffer_recv = FALSE;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
ctx->active = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CURLcode cf_socket_cntrl(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
int event, int arg1, void *arg2)
|
|
|
|
{
|
2023-01-03 20:13:37 +08:00
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
(void)arg1;
|
|
|
|
(void)arg2;
|
|
|
|
switch(event) {
|
|
|
|
case CF_CTRL_CONN_INFO_UPDATE:
|
|
|
|
cf_socket_active(cf, data);
|
|
|
|
break;
|
2023-01-03 20:13:37 +08:00
|
|
|
case CF_CTRL_DATA_SETUP:
|
2024-03-08 17:45:14 +08:00
|
|
|
Curl_persistconninfo(data, cf->conn, &ctx->ip);
|
2023-01-03 20:13:37 +08:00
|
|
|
break;
|
2023-10-26 23:02:45 +08:00
|
|
|
case CF_CTRL_FORGET_SOCKET:
|
|
|
|
ctx->sock = CURL_SOCKET_BAD;
|
|
|
|
break;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool cf_socket_conn_is_alive(struct Curl_cfilter *cf,
|
2023-03-06 19:44:45 +08:00
|
|
|
struct Curl_easy *data,
|
|
|
|
bool *input_pending)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
2023-03-01 20:05:09 +08:00
|
|
|
struct pollfd pfd[1];
|
|
|
|
int r;
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-03-06 19:44:45 +08:00
|
|
|
*input_pending = FALSE;
|
2022-12-30 16:14:55 +08:00
|
|
|
(void)data;
|
|
|
|
if(!ctx || ctx->sock == CURL_SOCKET_BAD)
|
|
|
|
return FALSE;
|
|
|
|
|
2023-03-01 20:05:09 +08:00
|
|
|
/* Check with 0 timeout if there are any events pending on the socket */
|
|
|
|
pfd[0].fd = ctx->sock;
|
|
|
|
pfd[0].events = POLLRDNORM|POLLIN|POLLRDBAND|POLLPRI;
|
|
|
|
pfd[0].revents = 0;
|
|
|
|
|
|
|
|
r = Curl_poll(pfd, 1, 0);
|
|
|
|
if(r < 0) {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "is_alive: poll error, assume dead");
|
2022-12-30 16:14:55 +08:00
|
|
|
return FALSE;
|
|
|
|
}
|
2023-03-01 20:05:09 +08:00
|
|
|
else if(r == 0) {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "is_alive: poll timeout, assume alive");
|
2022-12-30 16:14:55 +08:00
|
|
|
return TRUE;
|
|
|
|
}
|
2023-03-01 20:05:09 +08:00
|
|
|
else if(pfd[0].revents & (POLLERR|POLLHUP|POLLPRI|POLLNVAL)) {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "is_alive: err/hup/etc events, assume dead");
|
2023-03-01 20:05:09 +08:00
|
|
|
return FALSE;
|
|
|
|
}
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "is_alive: valid events, looks alive");
|
2023-03-06 19:44:45 +08:00
|
|
|
*input_pending = TRUE;
|
2022-12-30 16:14:55 +08:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
static CURLcode cf_socket_query(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
int query, int *pres1, void *pres2)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
|
|
|
switch(query) {
|
|
|
|
case CF_QUERY_SOCKET:
|
|
|
|
DEBUGASSERT(pres2);
|
|
|
|
*((curl_socket_t *)pres2) = ctx->sock;
|
|
|
|
return CURLE_OK;
|
|
|
|
case CF_QUERY_CONNECT_REPLY_MS:
|
|
|
|
if(ctx->got_first_byte) {
|
|
|
|
timediff_t ms = Curl_timediff(ctx->first_byte_at, ctx->started_at);
|
|
|
|
*pres1 = (ms < INT_MAX)? (int)ms : INT_MAX;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*pres1 = -1;
|
|
|
|
return CURLE_OK;
|
2023-03-04 00:54:44 +08:00
|
|
|
case CF_QUERY_TIMER_CONNECT: {
|
|
|
|
struct curltime *when = pres2;
|
|
|
|
switch(ctx->transport) {
|
|
|
|
case TRNSPRT_UDP:
|
|
|
|
case TRNSPRT_QUIC:
|
|
|
|
/* Since UDP connected sockets work different from TCP, we use the
|
|
|
|
* time of the first byte from the peer as the "connect" time. */
|
|
|
|
if(ctx->got_first_byte) {
|
|
|
|
*when = ctx->first_byte_at;
|
|
|
|
break;
|
|
|
|
}
|
2023-12-08 21:05:09 +08:00
|
|
|
FALLTHROUGH();
|
2023-03-04 00:54:44 +08:00
|
|
|
default:
|
|
|
|
*when = ctx->connected_at;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return cf->next?
|
|
|
|
cf->next->cft->query(cf->next, data, query, pres1, pres2) :
|
|
|
|
CURLE_UNKNOWN_OPTION;
|
|
|
|
}
|
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
struct Curl_cftype Curl_cft_tcp = {
|
2022-12-30 16:14:55 +08:00
|
|
|
"TCP",
|
|
|
|
CF_TYPE_IP_CONNECT,
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_LOG_LVL_NONE,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_destroy,
|
|
|
|
cf_tcp_connect,
|
|
|
|
cf_socket_close,
|
2024-06-07 16:12:39 +08:00
|
|
|
cf_socket_shutdown,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_get_host,
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
cf_socket_adjust_pollset,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_data_pending,
|
|
|
|
cf_socket_send,
|
|
|
|
cf_socket_recv,
|
|
|
|
cf_socket_cntrl,
|
|
|
|
cf_socket_conn_is_alive,
|
|
|
|
Curl_cf_def_conn_keep_alive,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_query,
|
2022-12-30 16:14:55 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
CURLcode Curl_cf_tcp_create(struct Curl_cfilter **pcf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
struct connectdata *conn,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
int transport)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = NULL;
|
|
|
|
struct Curl_cfilter *cf = NULL;
|
|
|
|
CURLcode result;
|
|
|
|
|
|
|
|
(void)data;
|
|
|
|
(void)conn;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
DEBUGASSERT(transport == TRNSPRT_TCP);
|
2023-11-08 07:22:58 +08:00
|
|
|
ctx = calloc(1, sizeof(*ctx));
|
2022-12-30 16:14:55 +08:00
|
|
|
if(!ctx) {
|
|
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto out;
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_ctx_init(ctx, ai, transport);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_tcp, ctx);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
*pcf = (!result)? cf : NULL;
|
|
|
|
if(result) {
|
|
|
|
Curl_safefree(cf);
|
|
|
|
Curl_safefree(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
static CURLcode cf_udp_setup_quic(struct Curl_cfilter *cf,
|
2024-06-02 14:40:42 +08:00
|
|
|
struct Curl_easy *data)
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
int rc;
|
2024-06-25 17:51:03 +08:00
|
|
|
int one = 1;
|
|
|
|
|
|
|
|
(void)one;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
|
|
|
|
/* QUIC needs a connected socket, nonblocking */
|
|
|
|
DEBUGASSERT(ctx->sock != CURL_SOCKET_BAD);
|
|
|
|
|
2024-06-03 04:30:52 +08:00
|
|
|
rc = connect(ctx->sock, &ctx->addr.sa_addr,
|
|
|
|
(curl_socklen_t)ctx->addr.addrlen);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
if(-1 == rc) {
|
2024-03-08 17:45:14 +08:00
|
|
|
return socket_connect_result(data, ctx->ip.remote_ip, SOCKERRNO);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
}
|
2024-01-09 20:21:02 +08:00
|
|
|
ctx->sock_connected = TRUE;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
set_local_ip(cf, data);
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "%s socket %" CURL_FORMAT_SOCKET_T
|
|
|
|
" connected: [%s:%d] -> [%s:%d]",
|
|
|
|
(ctx->transport == TRNSPRT_QUIC)? "QUIC" : "UDP",
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->sock, ctx->ip.local_ip, ctx->ip.local_port,
|
|
|
|
ctx->ip.remote_ip, ctx->ip.remote_port);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
|
2024-06-02 14:40:42 +08:00
|
|
|
/* Currently, cf->ctx->sock is always non-blocking because the only
|
|
|
|
* caller to cf_udp_setup_quic() is cf_udp_connect() that passes the
|
|
|
|
* non-blocking socket created by cf_socket_open() to it. Thus, we
|
2024-07-01 22:47:21 +08:00
|
|
|
* do not need to call curlx_nonblock() in cf_udp_setup_quic() anymore.
|
2024-06-02 14:40:42 +08:00
|
|
|
*/
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
switch(ctx->addr.family) {
|
|
|
|
#if defined(__linux__) && defined(IP_MTU_DISCOVER)
|
|
|
|
case AF_INET: {
|
|
|
|
int val = IP_PMTUDISC_DO;
|
|
|
|
(void)setsockopt(ctx->sock, IPPROTO_IP, IP_MTU_DISCOVER, &val,
|
|
|
|
sizeof(val));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if defined(__linux__) && defined(IPV6_MTU_DISCOVER)
|
|
|
|
case AF_INET6: {
|
|
|
|
int val = IPV6_PMTUDISC_DO;
|
|
|
|
(void)setsockopt(ctx->sock, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &val,
|
|
|
|
sizeof(val));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2024-06-25 17:51:03 +08:00
|
|
|
|
2024-06-29 08:55:55 +08:00
|
|
|
#if defined(__linux__) && defined(UDP_GRO) && \
|
|
|
|
(defined(HAVE_SENDMMSG) || defined(HAVE_SENDMSG)) && \
|
2024-06-25 17:51:03 +08:00
|
|
|
((defined(USE_NGTCP2) && defined(USE_NGHTTP3)) || defined(USE_QUICHE))
|
|
|
|
(void)setsockopt(ctx->sock, IPPROTO_UDP, UDP_GRO, &one,
|
|
|
|
(socklen_t)sizeof(one));
|
|
|
|
#endif
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
static CURLcode cf_udp_connect(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
bool blocking, bool *done)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
CURLcode result = CURLE_COULDNT_CONNECT;
|
|
|
|
|
|
|
|
(void)blocking;
|
|
|
|
if(cf->connected) {
|
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
*done = FALSE;
|
|
|
|
if(ctx->sock == CURL_SOCKET_BAD) {
|
|
|
|
result = cf_socket_open(cf, data);
|
|
|
|
if(result) {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "cf_udp_connect(), open failed -> %d", result);
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ctx->transport == TRNSPRT_QUIC) {
|
|
|
|
result = cf_udp_setup_quic(cf, data);
|
|
|
|
if(result)
|
|
|
|
goto out;
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "cf_udp_connect(), opened socket=%"
|
|
|
|
CURL_FORMAT_SOCKET_T " (%s:%d)",
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->sock, ctx->ip.local_ip, ctx->ip.local_port);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
else {
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "cf_udp_connect(), opened socket=%"
|
|
|
|
CURL_FORMAT_SOCKET_T " (unconnected)", ctx->sock);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
*done = TRUE;
|
|
|
|
cf->connected = TRUE;
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
out:
|
2022-12-30 16:14:55 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
struct Curl_cftype Curl_cft_udp = {
|
2022-12-30 16:14:55 +08:00
|
|
|
"UDP",
|
|
|
|
CF_TYPE_IP_CONNECT,
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_LOG_LVL_NONE,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_destroy,
|
|
|
|
cf_udp_connect,
|
|
|
|
cf_socket_close,
|
2024-06-07 16:12:39 +08:00
|
|
|
cf_socket_shutdown,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_get_host,
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
cf_socket_adjust_pollset,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_data_pending,
|
|
|
|
cf_socket_send,
|
|
|
|
cf_socket_recv,
|
|
|
|
cf_socket_cntrl,
|
|
|
|
cf_socket_conn_is_alive,
|
|
|
|
Curl_cf_def_conn_keep_alive,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_query,
|
2022-12-30 16:14:55 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
CURLcode Curl_cf_udp_create(struct Curl_cfilter **pcf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
struct connectdata *conn,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
int transport)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = NULL;
|
|
|
|
struct Curl_cfilter *cf = NULL;
|
|
|
|
CURLcode result;
|
|
|
|
|
|
|
|
(void)data;
|
|
|
|
(void)conn;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
DEBUGASSERT(transport == TRNSPRT_UDP || transport == TRNSPRT_QUIC);
|
2023-11-08 07:22:58 +08:00
|
|
|
ctx = calloc(1, sizeof(*ctx));
|
2022-12-30 16:14:55 +08:00
|
|
|
if(!ctx) {
|
|
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto out;
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_ctx_init(ctx, ai, transport);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_udp, ctx);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
*pcf = (!result)? cf : NULL;
|
|
|
|
if(result) {
|
|
|
|
Curl_safefree(cf);
|
|
|
|
Curl_safefree(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this is the TCP filter which can also handle this case */
|
2023-01-11 17:30:42 +08:00
|
|
|
struct Curl_cftype Curl_cft_unix = {
|
2022-12-30 16:14:55 +08:00
|
|
|
"UNIX",
|
|
|
|
CF_TYPE_IP_CONNECT,
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_LOG_LVL_NONE,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_destroy,
|
|
|
|
cf_tcp_connect,
|
|
|
|
cf_socket_close,
|
2024-06-07 16:12:39 +08:00
|
|
|
cf_socket_shutdown,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_get_host,
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
cf_socket_adjust_pollset,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_data_pending,
|
|
|
|
cf_socket_send,
|
|
|
|
cf_socket_recv,
|
|
|
|
cf_socket_cntrl,
|
|
|
|
cf_socket_conn_is_alive,
|
|
|
|
Curl_cf_def_conn_keep_alive,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_query,
|
2022-12-30 16:14:55 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
CURLcode Curl_cf_unix_create(struct Curl_cfilter **pcf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
struct connectdata *conn,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
const struct Curl_addrinfo *ai,
|
|
|
|
int transport)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = NULL;
|
|
|
|
struct Curl_cfilter *cf = NULL;
|
|
|
|
CURLcode result;
|
|
|
|
|
|
|
|
(void)data;
|
|
|
|
(void)conn;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
DEBUGASSERT(transport == TRNSPRT_UNIX);
|
2023-11-08 07:22:58 +08:00
|
|
|
ctx = calloc(1, sizeof(*ctx));
|
2022-12-30 16:14:55 +08:00
|
|
|
if(!ctx) {
|
|
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto out;
|
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_ctx_init(ctx, ai, transport);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_unix, ctx);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
*pcf = (!result)? cf : NULL;
|
|
|
|
if(result) {
|
|
|
|
Curl_safefree(cf);
|
|
|
|
Curl_safefree(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CURLcode cf_tcp_accept_connect(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
bool blocking, bool *done)
|
|
|
|
{
|
|
|
|
/* we start accepted, if we ever close, we cannot go on */
|
|
|
|
(void)data;
|
|
|
|
(void)blocking;
|
|
|
|
if(cf->connected) {
|
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
}
|
|
|
|
|
2023-01-11 17:30:42 +08:00
|
|
|
struct Curl_cftype Curl_cft_tcp_accept = {
|
2022-12-30 16:14:55 +08:00
|
|
|
"TCP-ACCEPT",
|
|
|
|
CF_TYPE_IP_CONNECT,
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_LOG_LVL_NONE,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_destroy,
|
|
|
|
cf_tcp_accept_connect,
|
|
|
|
cf_socket_close,
|
2024-06-07 16:12:39 +08:00
|
|
|
cf_socket_shutdown,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_get_host, /* TODO: not accurate */
|
lib: introduce struct easy_poll_set for poll information
Connection filter had a `get_select_socks()` method, inspired by the
various `getsocks` functions involved during the lifetime of a
transfer. These, depending on transfer state (CONNECT/DO/DONE/ etc.),
return sockets to monitor and flag if this shall be done for POLLIN
and/or POLLOUT.
Due to this design, sockets and flags could only be added, not
removed. This led to problems in filters like HTTP/2 where flow control
prohibits the sending of data until the peer increases the flow
window. The general transfer loop wants to write, adds POLLOUT, the
socket is writeable but no data can be written.
This leads to cpu busy loops. To prevent that, HTTP/2 did set the
`SEND_HOLD` flag of such a blocked transfer, so the transfer loop cedes
further attempts. This works if only one such filter is involved. If a
HTTP/2 transfer goes through a HTTP/2 proxy, two filters are
setting/clearing this flag and may step on each other's toes.
Connection filters `get_select_socks()` is replaced by
`adjust_pollset()`. They get passed a `struct easy_pollset` that keeps
up to `MAX_SOCKSPEREASYHANDLE` sockets and their `POLLIN|POLLOUT`
flags. This struct is initialized in `multi_getsock()` by calling the
various `getsocks()` implementations based on transfer state, as before.
After protocol handlers/transfer loop have set the sockets and flags
they want, the `easy_pollset` is *always* passed to the filters. Filters
"higher" in the chain are called first, starting at the first
not-yet-connection one. Each filter may add sockets and/or change
flags. When all flags are removed, the socket itself is removed from the
pollset.
Example:
* transfer wants to send, adds POLLOUT
* http/2 filter has a flow control block, removes POLLOUT and adds
POLLIN (it is waiting on a WINDOW_UPDATE from the server)
* TLS filter is connected and changes nothing
* h2-proxy filter also has a flow control block on its tunnel stream,
removes POLLOUT and adds POLLIN also.
* socket filter is connected and changes nothing
* The resulting pollset is then mixed together with all other transfers
and their pollsets, just as before.
Use of `SEND_HOLD` is no longer necessary in the filters.
All filters are adapted for the changed method. The handling in
`multi.c` has been adjusted, but its state handling the the protocol
handlers' `getsocks` method are untouched.
The most affected filters are http/2, ngtcp2, quiche and h2-proxy. TLS
filters needed to be adjusted for the connecting handshake read/write
handling.
No noticeable difference in performance was detected in local scorecard
runs.
Closes #11833
2023-09-04 18:06:07 +08:00
|
|
|
cf_socket_adjust_pollset,
|
2022-12-30 16:14:55 +08:00
|
|
|
cf_socket_data_pending,
|
|
|
|
cf_socket_send,
|
|
|
|
cf_socket_recv,
|
|
|
|
cf_socket_cntrl,
|
|
|
|
cf_socket_conn_is_alive,
|
|
|
|
Curl_cf_def_conn_keep_alive,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
cf_socket_query,
|
2022-12-30 16:14:55 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
CURLcode Curl_conn_tcp_listen_set(struct Curl_easy *data,
|
|
|
|
struct connectdata *conn,
|
|
|
|
int sockindex, curl_socket_t *s)
|
|
|
|
{
|
|
|
|
CURLcode result;
|
|
|
|
struct Curl_cfilter *cf = NULL;
|
|
|
|
struct cf_socket_ctx *ctx = NULL;
|
|
|
|
|
|
|
|
/* replace any existing */
|
|
|
|
Curl_conn_cf_discard_all(data, conn, sockindex);
|
|
|
|
DEBUGASSERT(conn->sock[sockindex] == CURL_SOCKET_BAD);
|
|
|
|
|
2023-11-08 07:22:58 +08:00
|
|
|
ctx = calloc(1, sizeof(*ctx));
|
2022-12-30 16:14:55 +08:00
|
|
|
if(!ctx) {
|
|
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ctx->transport = conn->transport;
|
|
|
|
ctx->sock = *s;
|
|
|
|
ctx->accepted = FALSE;
|
2023-01-11 17:30:42 +08:00
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_tcp_accept, ctx);
|
2022-12-30 16:14:55 +08:00
|
|
|
if(result)
|
|
|
|
goto out;
|
|
|
|
Curl_conn_cf_add(data, conn, sockindex, cf);
|
|
|
|
|
|
|
|
conn->sock[sockindex] = ctx->sock;
|
2023-01-03 20:13:37 +08:00
|
|
|
set_local_ip(cf, data);
|
2022-12-30 16:14:55 +08:00
|
|
|
ctx->active = TRUE;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
ctx->connected_at = Curl_now();
|
2022-12-30 16:14:55 +08:00
|
|
|
cf->connected = TRUE;
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "Curl_conn_tcp_listen_set(%"
|
|
|
|
CURL_FORMAT_SOCKET_T ")", ctx->sock);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
if(result) {
|
|
|
|
Curl_safefree(cf);
|
|
|
|
Curl_safefree(ctx);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:05:06 +08:00
|
|
|
static void set_accepted_remote_ip(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
|
|
|
{
|
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
#ifdef HAVE_GETPEERNAME
|
|
|
|
char buffer[STRERROR_LEN];
|
|
|
|
struct Curl_sockaddr_storage ssrem;
|
|
|
|
curl_socklen_t plen;
|
|
|
|
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.remote_ip[0] = 0;
|
|
|
|
ctx->ip.remote_port = 0;
|
2023-02-28 18:05:06 +08:00
|
|
|
plen = sizeof(ssrem);
|
|
|
|
memset(&ssrem, 0, plen);
|
|
|
|
if(getpeername(ctx->sock, (struct sockaddr*) &ssrem, &plen)) {
|
|
|
|
int error = SOCKERRNO;
|
|
|
|
failf(data, "getpeername() failed with errno %d: %s",
|
|
|
|
error, Curl_strerror(error, buffer, sizeof(buffer)));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(!Curl_addr2string((struct sockaddr*)&ssrem, plen,
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.remote_ip, &ctx->ip.remote_port)) {
|
2023-02-28 18:05:06 +08:00
|
|
|
failf(data, "ssrem inet_ntop() failed with errno %d: %s",
|
|
|
|
errno, Curl_strerror(errno, buffer, sizeof(buffer)));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#else
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->ip.remote_ip[0] = 0;
|
|
|
|
ctx->ip.remote_port = 0;
|
2023-02-28 18:05:06 +08:00
|
|
|
(void)data;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2022-12-30 16:14:55 +08:00
|
|
|
CURLcode Curl_conn_tcp_accepted_set(struct Curl_easy *data,
|
|
|
|
struct connectdata *conn,
|
|
|
|
int sockindex, curl_socket_t *s)
|
|
|
|
{
|
|
|
|
struct Curl_cfilter *cf = NULL;
|
|
|
|
struct cf_socket_ctx *ctx = NULL;
|
|
|
|
|
|
|
|
cf = conn->cfilter[sockindex];
|
2023-01-11 17:30:42 +08:00
|
|
|
if(!cf || cf->cft != &Curl_cft_tcp_accept)
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
|
|
|
|
ctx = cf->ctx;
|
|
|
|
/* discard the listen socket */
|
|
|
|
socket_close(data, conn, TRUE, ctx->sock);
|
|
|
|
ctx->sock = *s;
|
|
|
|
conn->sock[sockindex] = ctx->sock;
|
2023-02-28 18:05:06 +08:00
|
|
|
set_accepted_remote_ip(cf, data);
|
2023-01-03 20:13:37 +08:00
|
|
|
set_local_ip(cf, data);
|
2022-12-30 16:14:55 +08:00
|
|
|
ctx->active = TRUE;
|
|
|
|
ctx->accepted = TRUE;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
ctx->connected_at = Curl_now();
|
2022-12-30 16:14:55 +08:00
|
|
|
cf->connected = TRUE;
|
2023-08-03 23:32:25 +08:00
|
|
|
CURL_TRC_CF(data, cf, "accepted_set(sock=%" CURL_FORMAT_SOCKET_T
|
|
|
|
", remote=%s port=%d)",
|
2024-03-08 17:45:14 +08:00
|
|
|
ctx->sock, ctx->ip.remote_ip, ctx->ip.remote_port);
|
2022-12-30 16:14:55 +08:00
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2023-05-22 15:00:16 +08:00
|
|
|
/**
|
|
|
|
* Return TRUE iff `cf` is a socket filter.
|
|
|
|
*/
|
|
|
|
static bool cf_is_socket(struct Curl_cfilter *cf)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
2023-01-11 17:30:42 +08:00
|
|
|
return cf && (cf->cft == &Curl_cft_tcp ||
|
|
|
|
cf->cft == &Curl_cft_udp ||
|
|
|
|
cf->cft == &Curl_cft_unix ||
|
|
|
|
cf->cft == &Curl_cft_tcp_accept);
|
2022-12-30 16:14:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
CURLcode Curl_cf_socket_peek(struct Curl_cfilter *cf,
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
struct Curl_easy *data,
|
2022-12-30 16:14:55 +08:00
|
|
|
curl_socket_t *psock,
|
|
|
|
const struct Curl_sockaddr_ex **paddr,
|
2024-03-08 17:45:14 +08:00
|
|
|
struct ip_quadruple *pip)
|
2022-12-30 16:14:55 +08:00
|
|
|
{
|
2024-03-08 17:45:14 +08:00
|
|
|
(void)data;
|
2023-05-22 15:00:16 +08:00
|
|
|
if(cf_is_socket(cf) && cf->ctx) {
|
2022-12-30 16:14:55 +08:00
|
|
|
struct cf_socket_ctx *ctx = cf->ctx;
|
|
|
|
|
2023-01-06 19:33:34 +08:00
|
|
|
if(psock)
|
|
|
|
*psock = ctx->sock;
|
|
|
|
if(paddr)
|
|
|
|
*paddr = &ctx->addr;
|
2024-03-08 17:45:14 +08:00
|
|
|
if(pip)
|
|
|
|
*pip = ctx->ip;
|
2022-12-30 16:14:55 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
}
|