2012-12-28 19:03:09 +08:00
|
|
|
#ifndef HEADER_CURL_PROGRESS_H
|
|
|
|
#define HEADER_CURL_PROGRESS_H
|
2002-09-03 19:52:59 +08:00
|
|
|
/***************************************************************************
|
2004-11-15 19:27:03 +08:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
1999-12-29 22:20:26 +08:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2023-01-02 20:51:48 +08:00
|
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 22:20:26 +08:00
|
|
|
*
|
2002-09-03 19:52:59 +08:00
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
2020-11-04 21:02:01 +08:00
|
|
|
* are also available at https://curl.se/docs/copyright.html.
|
2004-11-15 19:27:03 +08:00
|
|
|
*
|
2001-01-03 17:29:33 +08:00
|
|
|
* 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
|
2002-09-03 19:52:59 +08:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 22:20:26 +08:00
|
|
|
*
|
2001-01-03 17:29:33 +08:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 22:20:26 +08:00
|
|
|
*
|
2002-09-03 19:52:59 +08:00
|
|
|
* SPDX-License-Identifier: curl
|
2022-05-17 17:16:50 +08:00
|
|
|
*
|
2002-09-03 19:52:59 +08:00
|
|
|
***************************************************************************/
|
1999-12-29 22:20:26 +08:00
|
|
|
|
2013-01-04 09:50:28 +08:00
|
|
|
#include "timeval.h"
|
1999-12-29 22:20:26 +08:00
|
|
|
|
2000-02-15 07:15:08 +08:00
|
|
|
|
2000-04-12 05:48:33 +08:00
|
|
|
typedef enum {
|
|
|
|
TIMER_NONE,
|
2014-05-16 02:43:32 +08:00
|
|
|
TIMER_STARTOP,
|
2023-12-27 16:28:48 +08:00
|
|
|
TIMER_STARTSINGLE, /* start of transfer, might get queued */
|
|
|
|
TIMER_POSTQUEUE, /* start, immediately after dequeue */
|
2000-04-12 05:48:33 +08:00
|
|
|
TIMER_NAMELOOKUP,
|
|
|
|
TIMER_CONNECT,
|
2008-07-03 14:56:03 +08:00
|
|
|
TIMER_APPCONNECT,
|
2000-04-12 05:48:33 +08:00
|
|
|
TIMER_PRETRANSFER,
|
2001-11-20 23:00:50 +08:00
|
|
|
TIMER_STARTTRANSFER,
|
2000-04-12 05:48:33 +08:00
|
|
|
TIMER_POSTRANSFER,
|
2011-12-19 21:35:20 +08:00
|
|
|
TIMER_STARTACCEPT,
|
2002-04-16 15:59:20 +08:00
|
|
|
TIMER_REDIRECT,
|
2000-04-12 05:48:33 +08:00
|
|
|
TIMER_LAST /* must be last */
|
|
|
|
} timerid;
|
2004-11-15 19:27:03 +08:00
|
|
|
|
2021-01-18 18:56:50 +08:00
|
|
|
int Curl_pgrsDone(struct Curl_easy *data);
|
2016-06-21 21:47:12 +08:00
|
|
|
void Curl_pgrsStartNow(struct Curl_easy *data);
|
|
|
|
void Curl_pgrsSetDownloadSize(struct Curl_easy *data, curl_off_t size);
|
|
|
|
void Curl_pgrsSetUploadSize(struct Curl_easy *data, curl_off_t size);
|
2023-09-23 17:20:00 +08:00
|
|
|
|
|
|
|
/* It is fine to not check the return code if 'size' is set to 0 */
|
|
|
|
CURLcode Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size);
|
|
|
|
|
2016-06-21 21:47:12 +08:00
|
|
|
void Curl_pgrsSetUploadCounter(struct Curl_easy *data, curl_off_t size);
|
2018-03-15 23:43:00 +08:00
|
|
|
void Curl_ratelimit(struct Curl_easy *data, struct curltime now);
|
2021-01-18 18:56:50 +08:00
|
|
|
int Curl_pgrsUpdate(struct Curl_easy *data);
|
2024-07-20 06:44:27 +08:00
|
|
|
void Curl_pgrsUpdate_nometer(struct Curl_easy *data);
|
|
|
|
|
2017-06-22 01:15:46 +08:00
|
|
|
void Curl_pgrsResetTransferSizes(struct Curl_easy *data);
|
2020-08-24 17:07:59 +08:00
|
|
|
struct curltime Curl_pgrsTime(struct Curl_easy *data, timerid timer);
|
2024-08-01 19:05:49 +08:00
|
|
|
timediff_t Curl_pgrsLimitWaitTime(struct pgrs_dir *d,
|
|
|
|
curl_off_t speed_limit,
|
2018-03-10 21:07:38 +08:00
|
|
|
struct curltime now);
|
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
|
|
|
/**
|
|
|
|
* Update progress timer with the elapsed time from its start to `timestamp`.
|
|
|
|
* This allows updating timers later and is used by happy eyeballing, where
|
|
|
|
* we only want to record the winner's times.
|
|
|
|
*/
|
|
|
|
void Curl_pgrsTimeWas(struct Curl_easy *data, timerid timer,
|
|
|
|
struct curltime timestamp);
|
1999-12-29 22:20:26 +08:00
|
|
|
|
TLS: TLSv1.3 earlydata support for curl
Based on #14135, implement TLSv1.3 earlydata support for the curl
command line, libcurl and its implementation in GnuTLS.
If a known TLS session announces early data support, and the feature is
enabled *and* it is not a "connect-only" transfer, delay the TLS
handshake until the first request is being sent.
- Add --tls-earldata as new boolean command line option for curl.
- Add CURLSSLOPT_EARLYDATA to libcurl to enable use of the feature.
- Add CURLINFO_EARLYDATA_SENT_T to libcurl, reporting the amount of
bytes sent and accepted/rejected by the server.
Implementation details:
- store the ALPN protocol selected at the SSL session.
- When reusing the session and enabling earlydata, use exactly
that ALPN protocol for negoptiation with the server. When the
sessions ALPN does not match the connections ALPN, earlydata
will not be enabled.
- Check that the server selected the correct ALPN protocol for
an earlydata connect. If the server does not confirm or reports
something different, the connect fails.
- HTTP/2: delay sending the initial SETTINGS frames during connect,
if not connect-only.
Verification:
- add test_02_32 to verify earlydata GET with nghttpx.
- add test_07_70 to verify earlydata PUT with nghttpx.
- add support in 'hx-download', 'hx-upload' clients for the feature
Assisted-by: ad-chaos on github
Closes #15211
2024-10-09 20:46:32 +08:00
|
|
|
void Curl_pgrsEarlyData(struct Curl_easy *data, curl_off_t sent);
|
|
|
|
|
2000-02-15 07:15:08 +08:00
|
|
|
#define PGRS_HIDE (1<<4)
|
|
|
|
#define PGRS_UL_SIZE_KNOWN (1<<5)
|
|
|
|
#define PGRS_DL_SIZE_KNOWN (1<<6)
|
|
|
|
#define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
|
|
|
|
|
2012-12-28 19:03:09 +08:00
|
|
|
#endif /* HEADER_CURL_PROGRESS_H */
|