mirror of
https://github.com/curl/curl.git
synced 2024-12-15 06:40:09 +08:00
671158242d
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
193 lines
6.9 KiB
C
193 lines
6.9 KiB
C
#ifndef HEADER_CURL_CF_SOCKET_H
|
|
#define HEADER_CURL_CF_SOCKET_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* 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"
|
|
|
|
#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
|
|
#include "sockaddr.h"
|
|
|
|
struct Curl_addrinfo;
|
|
struct Curl_cfilter;
|
|
struct Curl_easy;
|
|
struct connectdata;
|
|
struct Curl_sockaddr_ex;
|
|
|
|
/*
|
|
* 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.
|
|
*/
|
|
struct Curl_sockaddr_ex {
|
|
int family;
|
|
int socktype;
|
|
int protocol;
|
|
unsigned int addrlen;
|
|
union {
|
|
struct sockaddr addr;
|
|
struct Curl_sockaddr_storage buff;
|
|
} _sa_ex_u;
|
|
};
|
|
#define sa_addr _sa_ex_u.addr
|
|
|
|
|
|
/*
|
|
* Create a socket based on info from 'conn' and 'ai'.
|
|
*
|
|
* Fill in 'addr' and 'sockfd' accordingly if OK is returned. 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);
|
|
|
|
int Curl_socket_close(struct Curl_easy *data, struct connectdata *conn,
|
|
curl_socket_t sock);
|
|
|
|
/*
|
|
* This function should return TRUE if the socket is to be assumed to
|
|
* be dead. Most commonly this happens when the server has closed the
|
|
* connection due to inactivity.
|
|
*/
|
|
bool Curl_socket_is_dead(curl_socket_t sock);
|
|
|
|
/**
|
|
* Determine the curl code for a socket connect() == -1 with errno.
|
|
*/
|
|
CURLcode Curl_socket_connect_result(struct Curl_easy *data,
|
|
const char *ipaddress, int error);
|
|
|
|
#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
|
|
|
|
*/
|
|
void Curl_sndbufset(curl_socket_t sockfd);
|
|
#else
|
|
#define Curl_sndbufset(y) Curl_nop_stmt
|
|
#endif
|
|
|
|
/**
|
|
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and
|
|
* set the transport used.
|
|
*/
|
|
void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
|
|
const struct Curl_addrinfo *ai,
|
|
int transport);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a TCP socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_tcp_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
const struct Curl_addrinfo *ai,
|
|
int transport);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a UDP socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_udp_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
const struct Curl_addrinfo *ai,
|
|
int transport);
|
|
|
|
/**
|
|
* Creates a cfilter that opens a UNIX socket to the given address
|
|
* when calling its `connect` implementation.
|
|
* The filter will not touch any connection/data flags and can be
|
|
* used in happy eyeballing. Once selected for use, its `_active()`
|
|
* method needs to be called.
|
|
*/
|
|
CURLcode Curl_cf_unix_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
const struct Curl_addrinfo *ai,
|
|
int transport);
|
|
|
|
/**
|
|
* Creates a cfilter that keeps a listening socket.
|
|
*/
|
|
CURLcode Curl_conn_tcp_listen_set(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex,
|
|
curl_socket_t *s);
|
|
|
|
/**
|
|
* Replace the listen socket with the accept()ed one.
|
|
*/
|
|
CURLcode Curl_conn_tcp_accepted_set(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex,
|
|
curl_socket_t *s);
|
|
|
|
/**
|
|
* Return TRUE iff `cf` is a socket filter.
|
|
*/
|
|
bool Curl_cf_is_socket(struct Curl_cfilter *cf);
|
|
|
|
/**
|
|
* Peek at the socket and remote ip/port the socket filter is using.
|
|
* The filter owns all returned values.
|
|
* @param psock pointer to hold socket descriptor or NULL
|
|
* @param paddr pointer to hold addr reference or NULL
|
|
* @param pr_ip_str pointer to hold remote addr as string or NULL
|
|
* @param pr_port pointer to hold remote port number or NULL
|
|
* @param pl_ip_str pointer to hold local addr as string or NULL
|
|
* @param pl_port pointer to hold local port number or NULL
|
|
* Returns error if the filter is of invalid type.
|
|
*/
|
|
CURLcode Curl_cf_socket_peek(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
curl_socket_t *psock,
|
|
const struct Curl_sockaddr_ex **paddr,
|
|
const char **pr_ip_str, int *pr_port,
|
|
const char **pl_ip_str, int *pl_port);
|
|
|
|
extern struct Curl_cftype Curl_cft_tcp;
|
|
extern struct Curl_cftype Curl_cft_udp;
|
|
extern struct Curl_cftype Curl_cft_unix;
|
|
extern struct Curl_cftype Curl_cft_tcp_accept;
|
|
|
|
#endif /* HEADER_CURL_CF_SOCKET_H */
|