mirror of
https://github.com/curl/curl
synced 2026-08-25 12:32:35 -04:00
tidy-up: miscellaneous
- H3 proxy: re-sync code with original source `curl_ngtcp2.c` to reduce
differences, and to apply missed minor fixes. Also apply clang-format.
Drop redundant `#undef`s, casts, `#endif` comments, includes, drop
intermediate variables, sync include and macro order.
Follow-up to e78b1b3ecc #21153
- INSTALL-CMAKE.md: move `CURL_ENABLE_SMB` to the enable section.
- tests/http/env: rename `tcpdmp` to `tcpdump` to match object variable.
- mbedtls: drop incorrect `mbedTLS 4+` comments.
(features are also supported by 3+, meaning it's always supported.)
- lib1648: rename a variable to match purpose.
- CIPHERS.md: alpha-sort link list.
- replace rare `X''` hex markup with `0x`.
- `IP v4/6` -> `IPv4/6`.
- 'version X.Y' -> 'vX.Y', where sensible.
- 'VX.Y' -> 'vX.Y', where sensible.
- fix indents, casing, newlines, typos.
Closes #21772
This commit is contained in:
Viktor Szakats
parent
a7d4abb0cf
commit
7e1001bcd6
36 changed files with 331 additions and 372 deletions
6
.github/workflows/linux-old.yml
vendored
6
.github/workflows/linux-old.yml
vendored
|
|
@ -116,10 +116,8 @@ jobs:
|
|||
echo '::group::raw'; cat bld-1/lib/curl_config.h || true; echo '::endgroup::'
|
||||
grep -F '#define' bld-1/lib/curl_config.h | sort || true
|
||||
|
||||
# when this job can get a libssh version 0.9.0 or later, this should get
|
||||
# that enabled again
|
||||
# when this job can get c-ares 1.16.0 or later, we can enable that
|
||||
# again
|
||||
# when this job can get libssh 0.9.0 or greater, this should get that enabled again
|
||||
# when this job can get c-ares 1.16.0 or greater, this should get that enabled again
|
||||
|
||||
- name: 'CM configure (out-of-tree, zstd, gssapi)'
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ This release includes the following bugfixes:
|
|||
o KNOWN_BUGS: remove stale Threads::Threads entry [135]
|
||||
o ldap: fix minor leak on write callback error [24]
|
||||
o ldap: fix to not leak `attribute` on OOM (WinLDAP) [79]
|
||||
o ldap: switch of chasing referrals [114]
|
||||
o ldap: switch off chasing referrals [114]
|
||||
o lib678: fix to not be perma-skipped [10]
|
||||
o lib: make `__STDC_VERSION__` literals `L` (where missing)
|
||||
o lib: two minor typos [16]
|
||||
|
|
@ -101,7 +101,7 @@ This release includes the following bugfixes:
|
|||
o setopt: gate a few proxy TLS options by checking backend support [35]
|
||||
o setopt: more careful cleanup of the HSTS cache [45]
|
||||
o show-headers.md: mention bold headers and --no-styled-output [17]
|
||||
o snpego_sspi: preserve distinction btw policy-only and uncond delegation [74]
|
||||
o spnego_sspi: preserve distinction btw policy-only and uncond delegation [74]
|
||||
o spnego_sspi: honor CURLOPT_GSSAPI_DELEGATION for Windows SSPI [89]
|
||||
o src: fix comment typos [83]
|
||||
o SSLCERTS: document 8.19.0 default Native CA builds (Windows) [14]
|
||||
|
|
|
|||
|
|
@ -2458,7 +2458,7 @@ if test "x$OPT_LIBSSH2" != "xno"; then
|
|||
CPPFLAGS="$CPPFLAGS $CPP_SSH2"
|
||||
LIBS="$LIB_SSH2 $LIBS"
|
||||
|
||||
dnl check for function added in libssh2 version 1.9.0
|
||||
dnl check for function added in libssh2 v1.9.0
|
||||
AC_CHECK_LIB(ssh2, libssh2_agent_get_identity_path)
|
||||
|
||||
AC_CHECK_HEADER(libssh2.h,
|
||||
|
|
|
|||
|
|
@ -270,10 +270,10 @@ Restrict to only TLS 1.2 with the `CAMELLIA-128-GCM` cipher.
|
|||
|
||||
## Further reading
|
||||
|
||||
- [OpenSSL cipher suite names documentation](https://docs.openssl.org/master/man1/openssl-ciphers/#cipher-suite-names)
|
||||
- [wolfSSL cipher support documentation](https://www.wolfssl.com/documentation/manuals/wolfssl/chapter04.html#cipher-support)
|
||||
- [mbedTLS cipher suites reference](https://mbed-tls.readthedocs.io/projects/api/en/development/api/file/ssl__ciphersuites_8h/)
|
||||
- [Schannel cipher suites documentation](https://learn.microsoft.com/windows/win32/secauthn/cipher-suites-in-schannel)
|
||||
- [IANA cipher suites list](https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4)
|
||||
- [Wikipedia cipher suite article](https://en.wikipedia.org/wiki/Cipher_suite)
|
||||
- [GnuTLS Priority Strings](https://gnutls.org/manual/html_node/Priority-Strings.html)
|
||||
- [IANA cipher suites list](https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4)
|
||||
- [mbedTLS cipher suites reference](https://mbed-tls.readthedocs.io/projects/api/en/development/api/file/ssl__ciphersuites_8h/)
|
||||
- [OpenSSL cipher suite names documentation](https://docs.openssl.org/master/man1/openssl-ciphers/#cipher-suite-names)
|
||||
- [Schannel cipher suites documentation](https://learn.microsoft.com/windows/win32/secauthn/cipher-suites-in-schannel)
|
||||
- [Wikipedia cipher suite article](https://en.wikipedia.org/wiki/Cipher_suite)
|
||||
- [wolfSSL cipher support documentation](https://www.wolfssl.com/documentation/manuals/wolfssl/chapter04.html#cipher-support)
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ work.
|
|||
has already been closed.
|
||||
|
||||
- `Ref: URL` to more information about the commit; use `Bug:` instead for a
|
||||
reference to a bug on another bug tracker]
|
||||
reference to a bug on another bug tracker.
|
||||
|
||||
- `Fixes #1234` - if this fixes a GitHub issue; GitHub closes the issue once
|
||||
this commit is merged.
|
||||
|
|
|
|||
|
|
@ -242,6 +242,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
|
|||
## Enabling features
|
||||
|
||||
- `CURL_ENABLE_NTLM`: Enable NTLM support. Default: `OFF`
|
||||
- `CURL_ENABLE_SMB`: Enable SMB. Default: `OFF`
|
||||
- `CURL_ENABLE_SSL`: Enable SSL support. Default: `ON`
|
||||
- `CURL_WINDOWS_SSPI`: Enable SSPI on Windows. Default: =`CURL_USE_SCHANNEL`
|
||||
- `ENABLE_IPV6`: Enable IPv6 support. Default: `ON` if target supports IPv6.
|
||||
|
|
@ -296,7 +297,6 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
|
|||
- `CURL_DISABLE_RTSP`: Disable RTSP. Default: `OFF`
|
||||
- `CURL_DISABLE_SHA512_256`: Disable SHA-512/256 hash algorithm. Default: `OFF`
|
||||
- `CURL_DISABLE_SHUFFLE_DNS`: Disable shuffle DNS feature. Default: `OFF`
|
||||
- `CURL_ENABLE_SMB`: Enable SMB. Default: `OFF`
|
||||
- `CURL_DISABLE_SMTP`: Disable SMTP. Default: `OFF`
|
||||
- `CURL_DISABLE_SOCKETPAIR`: Disable use of socketpair for curl_multi_poll(). Default: `OFF`
|
||||
- `CURL_DISABLE_SRP`: Disable TLS-SRP support. Default: `OFF`
|
||||
|
|
@ -486,7 +486,7 @@ Examples:
|
|||
- `HTTPD`: Absolute path. Default: search for `apache2`
|
||||
- `DANTED`: Absolute path. Default: search for `danted`
|
||||
- `TEST_NGHTTPX`: Absolute path. Default: search for `nghttpx`
|
||||
- `VSFTPD`: Absolute path. Default: search for `vsftps`
|
||||
- `VSFTPD`: Absolute path. Default: search for `vsftpd`
|
||||
- `SSHD`: Absolute path. Default: search for `sshd`
|
||||
- `SFTPD`: Absolute path. Default: search for `sftp-server`
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ Once downloaded, build `curl` using `--with-rustls` and the path to the extracte
|
|||
Building `rustls-ffi` from source requires both a rust compiler, and the [cargo-c] cargo plugin.
|
||||
|
||||
To install a Rust compiler, use [rustup] or your package manager to install
|
||||
the **1.73+** or newer toolchain.
|
||||
the **1.73** or newer toolchain.
|
||||
|
||||
To install `cargo-c`, use your [package manager][cargo-c pkg], download
|
||||
[a pre-built archive][cargo-c prebuilt], or build it from source with `cargo install cargo-c`.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
Where XX, YY and ZZ are the main version, release and patch numbers in
|
||||
hexadecimal (using 8 bits each). All three numbers are always represented
|
||||
using two digits. 1.2 would appear as "0x010200" while version 9.11.7
|
||||
using two digits. Version 1.2 would appear as "0x010200" while 9.11.7
|
||||
appears as "0x090b07".
|
||||
|
||||
This 6-digit (24 bits) hexadecimal number does not show pre-release number,
|
||||
|
|
|
|||
|
|
@ -1518,6 +1518,3 @@ out:
|
|||
}
|
||||
|
||||
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY && USE_NGHTTP2 */
|
||||
|
||||
/* Do not leak this filter's call_data accessor in unity builds. */
|
||||
#undef CF_CTX_CALL_DATA
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
#include "curl_setup.h"
|
||||
|
||||
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) && \
|
||||
|
|
@ -29,10 +28,10 @@
|
|||
defined(USE_NGTCP2) && defined(USE_OPENSSL)
|
||||
|
||||
#include <ngtcp2/ngtcp2.h>
|
||||
#include <ngtcp2/ngtcp2_crypto.h>
|
||||
|
||||
#ifdef USE_OPENSSL
|
||||
#include <openssl/err.h>
|
||||
#if defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC)
|
||||
#if defined(OPENSSL_IS_AWSLC) || defined(OPENSSL_IS_BORINGSSL)
|
||||
#include <ngtcp2/ngtcp2_crypto_boringssl.h>
|
||||
#elif defined(OPENSSL_QUIC_API2)
|
||||
#include <ngtcp2/ngtcp2_crypto_ossl.h>
|
||||
|
|
@ -40,11 +39,15 @@
|
|||
#include <ngtcp2/ngtcp2_crypto_quictls.h>
|
||||
#endif
|
||||
#include "vtls/openssl.h"
|
||||
#endif /* USE_OPENSSL */
|
||||
#endif
|
||||
|
||||
#include <nghttp3/nghttp3.h>
|
||||
|
||||
#include "urldata.h"
|
||||
#include "url.h"
|
||||
#include "uint-hash.h"
|
||||
#include "curl_trc.h"
|
||||
#include "rand.h"
|
||||
#include "hash.h"
|
||||
#include "sendf.h"
|
||||
#include "multiif.h"
|
||||
|
|
@ -57,17 +60,13 @@
|
|||
#include "dynhds.h"
|
||||
#include "http_proxy.h"
|
||||
#include "select.h"
|
||||
#include "uint-hash.h"
|
||||
#include "vquic/vquic.h"
|
||||
#include "vquic/vquic_int.h"
|
||||
#include "vquic/vquic-tls.h"
|
||||
#include "vtls/vtls.h"
|
||||
#include "vtls/vtls_scache.h"
|
||||
#include "curl_trc.h"
|
||||
#include "cf-h3-proxy.h"
|
||||
#include "url.h"
|
||||
#include "capsule.h"
|
||||
#include "rand.h"
|
||||
|
||||
/* A stream window is the maximum amount we need to buffer for
|
||||
* each active transfer. We use HTTP/3 flow control and only ACK
|
||||
|
|
@ -79,7 +78,7 @@
|
|||
|
||||
/* The pool keeps spares around and half of a full stream window
|
||||
* seems good. More does not seem to improve performance.
|
||||
* The benefit of the pool is that stream buffer to not keep
|
||||
* The benefit of the pool is that stream buffers do not keep
|
||||
* spares. Memory consumption goes down when streams run empty,
|
||||
* have a large upload done, etc. */
|
||||
#define PROXY_H3_STREAM_POOL_SPARES \
|
||||
|
|
@ -90,11 +89,10 @@
|
|||
#define PROXY_H3_STREAM_SEND_CHUNKS \
|
||||
(PROXY_H3_STREAM_WINDOW_SIZE / PROXY_H3_STREAM_CHUNK_SIZE)
|
||||
|
||||
#define PROXY_QUIC_MAX_STREAMS (256*1024)
|
||||
#define PROXY_QUIC_HANDSHAKE_TIMEOUT (10*NGTCP2_SECONDS)
|
||||
#define PROXY_QUIC_MAX_STREAMS (256 * 1024)
|
||||
#define PROXY_QUIC_HANDSHAKE_TIMEOUT (10 * NGTCP2_SECONDS)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
typedef enum {
|
||||
H3_TUNNEL_INIT, /* init/default/no tunnel state */
|
||||
H3_TUNNEL_CONNECT, /* CONNECT request is being sent */
|
||||
H3_TUNNEL_RESPONSE, /* CONNECT response received completely */
|
||||
|
|
@ -104,8 +102,7 @@ typedef enum
|
|||
|
||||
struct h3_proxy_stream_ctx;
|
||||
|
||||
struct h3_tunnel_stream
|
||||
{
|
||||
struct h3_tunnel_stream {
|
||||
struct http_resp *resp;
|
||||
char *authority;
|
||||
struct h3_proxy_stream_ctx *stream;
|
||||
|
|
@ -218,7 +215,7 @@ struct cf_ngtcp2_proxy_ctx {
|
|||
struct curl_tls_ctx tls;
|
||||
#ifdef OPENSSL_QUIC_API2
|
||||
ngtcp2_crypto_ossl_ctx *ossl_ctx;
|
||||
#endif /* OPENSSL_QUIC_API2 */
|
||||
#endif
|
||||
ngtcp2_path connected_path;
|
||||
ngtcp2_conn *qconn;
|
||||
ngtcp2_cid dcid;
|
||||
|
|
@ -235,8 +232,7 @@ struct cf_ngtcp2_proxy_ctx {
|
|||
struct curltime handshake_at; /* time connect handshake finished */
|
||||
struct bufc_pool stream_bufcp; /* chunk pool for streams */
|
||||
struct dynbuf scratch; /* temp buffer for header construction */
|
||||
struct uint_hash streams;
|
||||
/* hash `data->mid` to `h3_proxy_stream_ctx` */
|
||||
struct uint_hash streams; /* hash data->mid to h3_proxy_stream_ctx */
|
||||
uint64_t used_bidi_streams; /* bidi streams we have opened */
|
||||
uint64_t max_bidi_streams; /* max bidi streams we can open */
|
||||
size_t earlydata_max; /* max amount of early data supported by
|
||||
|
|
@ -252,8 +248,7 @@ struct cf_ngtcp2_proxy_ctx {
|
|||
BIT(shutdown_started); /* queued shutdown packets */
|
||||
};
|
||||
|
||||
struct cf_h3_proxy_ctx
|
||||
{
|
||||
struct cf_h3_proxy_ctx {
|
||||
struct cf_ngtcp2_proxy_ctx *ngtcp2_ctx;
|
||||
struct cf_call_data call_data; /* fallback before backend ctx exists */
|
||||
struct bufq inbufq; /* network receive buffer */
|
||||
|
|
@ -266,8 +261,7 @@ struct cf_h3_proxy_ctx
|
|||
/**
|
||||
* All about the H3 internals of a stream
|
||||
*/
|
||||
struct h3_proxy_stream_ctx
|
||||
{
|
||||
struct h3_proxy_stream_ctx {
|
||||
int64_t id; /* HTTP/3 stream identifier */
|
||||
struct bufq sendbuf; /* h3 request body */
|
||||
size_t sendbuf_len_in_flight; /* sendbuf amount "in flight" */
|
||||
|
|
@ -356,7 +350,7 @@ static void cf_ngtcp2_proxy_ctx_close(struct cf_ngtcp2_proxy_ctx *ctx)
|
|||
ngtcp2_crypto_ossl_ctx_del(ctx->ossl_ctx);
|
||||
ctx->ossl_ctx = NULL;
|
||||
}
|
||||
#endif /* OPENSSL_QUIC_API2 */
|
||||
#endif
|
||||
ctx->call_data = save;
|
||||
}
|
||||
|
||||
|
|
@ -393,8 +387,8 @@ static void cf_ngtcp2_proxy_setup_keep_alive(struct Curl_cfilter *cf,
|
|||
ngtcp2_conn_set_keep_alive_timeout(ctx->qconn, keep_ns);
|
||||
CURL_TRC_CF(data, cf, "peer idle timeout is %" PRIu64 "ms, "
|
||||
"set keep-alive to %" PRIu64 " ms.",
|
||||
(uint64_t)(rp->max_idle_timeout / NGTCP2_MILLISECONDS),
|
||||
(uint64_t)(keep_ns / NGTCP2_MILLISECONDS));
|
||||
rp->max_idle_timeout / NGTCP2_MILLISECONDS,
|
||||
keep_ns / NGTCP2_MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -451,7 +445,7 @@ static void proxy_quic_printf(void *user_data, const char *fmt, ...)
|
|||
va_end(ap);
|
||||
curl_mfprintf(stderr, "\n");
|
||||
}
|
||||
#endif /* DEBUG_NGTCP2 */
|
||||
#endif
|
||||
|
||||
static void proxy_qlog_callback(void *user_data, uint32_t flags,
|
||||
const void *data, size_t datalen)
|
||||
|
|
@ -483,7 +477,7 @@ static void quic_settings_proxy(struct cf_ngtcp2_proxy_ctx *ctx,
|
|||
s->log_printf = proxy_quic_printf;
|
||||
#else
|
||||
s->log_printf = NULL;
|
||||
#endif /* DEBUG_NGTCP2 */
|
||||
#endif
|
||||
|
||||
s->initial_ts = pktx->ts;
|
||||
s->handshake_timeout = (data->set.connecttimeout > 0) ?
|
||||
|
|
@ -496,7 +490,7 @@ static void quic_settings_proxy(struct cf_ngtcp2_proxy_ctx *ctx,
|
|||
/* try ten times the ngtcp2 defaults here for problems with Caddy */
|
||||
s->glitch_ratelim_burst = 1000 * 10;
|
||||
s->glitch_ratelim_rate = 33 * 10;
|
||||
#endif /* NGTCP2_SETTINGS_V3 */
|
||||
#endif
|
||||
t->initial_max_data = 10 * PROXY_H3_STREAM_WINDOW_SIZE;
|
||||
t->initial_max_stream_data_bidi_local = PROXY_H3_STREAM_WINDOW_SIZE;
|
||||
t->initial_max_stream_data_bidi_remote = PROXY_H3_STREAM_WINDOW_SIZE;
|
||||
|
|
@ -558,7 +552,6 @@ static void cf_ngtcp2_proxy_h3_err_set(struct Curl_cfilter *cf,
|
|||
}
|
||||
|
||||
/* How to access `call_data` from a cf_h3_proxy filter */
|
||||
#undef CF_CTX_CALL_DATA
|
||||
static struct cf_call_data *cf_h3_proxy_call_data(struct Curl_cfilter *cf)
|
||||
{
|
||||
struct cf_h3_proxy_ctx *ctx = cf ? cf->ctx : NULL;
|
||||
|
|
@ -571,6 +564,7 @@ static struct cf_call_data *cf_h3_proxy_call_data(struct Curl_cfilter *cf)
|
|||
return &ctx->call_data;
|
||||
}
|
||||
|
||||
#undef CF_CTX_CALL_DATA
|
||||
#define CF_CTX_CALL_DATA(cf) (*cf_h3_proxy_call_data(cf))
|
||||
|
||||
static void cf_h3_proxy_ctx_clear(struct cf_h3_proxy_ctx *ctx)
|
||||
|
|
@ -726,8 +720,7 @@ static void cf_h3_proxy_upd_rx_win(struct Curl_cfilter *cf,
|
|||
if(!stream->rx_offset)
|
||||
return;
|
||||
|
||||
avail = Curl_rlimit_avail(&data->progress.dl.rlimit,
|
||||
Curl_pgrs_now(data));
|
||||
avail = Curl_rlimit_avail(&data->progress.dl.rlimit, Curl_pgrs_now(data));
|
||||
if(avail <= 0) {
|
||||
/* nothing available, do not extend the rx offset */
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] dl rate limit exhausted (%" PRId64
|
||||
|
|
@ -828,13 +821,12 @@ static int cb_h3_proxy_deferred_consume(nghttp3_conn *conn, int64_t stream_id,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int cb_h3_proxy_recv_header(nghttp3_conn *conn, int64_t sid,
|
||||
static int cb_h3_proxy_recv_header(nghttp3_conn *conn, int64_t stream_id,
|
||||
int32_t token, nghttp3_rcbuf *name,
|
||||
nghttp3_rcbuf *value, uint8_t flags,
|
||||
void *user_data, void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
int64_t stream_id = sid;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
nghttp3_vec h3name = nghttp3_rcbuf_get_buf(name);
|
||||
|
|
@ -888,9 +880,8 @@ static int cb_h3_proxy_recv_header(nghttp3_conn *conn, int64_t sid,
|
|||
}
|
||||
else {
|
||||
/* store as an HTTP1-style header */
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] header: %.*s: %.*s",
|
||||
stream_id, (int)h3name.len, h3name.base,
|
||||
(int)h3val.len, h3val.base);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] header: %.*s: %.*s", stream_id,
|
||||
(int)h3name.len, h3name.base, (int)h3val.len, h3val.base);
|
||||
result = Curl_dynhds_add(&proxy_ctx->tunnel.resp->headers,
|
||||
(const char *)h3name.base, h3name.len,
|
||||
(const char *)h3val.base, h3val.len);
|
||||
|
|
@ -901,14 +892,14 @@ static int cb_h3_proxy_recv_header(nghttp3_conn *conn, int64_t sid,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int cb_h3_proxy_end_headers(nghttp3_conn *conn, int64_t sid,
|
||||
int fin, void *user_data, void *stream_user_data)
|
||||
static int cb_h3_proxy_end_headers(nghttp3_conn *conn, int64_t stream_id,
|
||||
int fin, void *user_data,
|
||||
void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
struct Curl_easy *data = stream_user_data;
|
||||
int64_t stream_id = sid;
|
||||
struct h3_proxy_stream_ctx *stream;
|
||||
(void)conn;
|
||||
(void)stream_id;
|
||||
|
|
@ -932,8 +923,8 @@ static int cb_h3_proxy_end_headers(nghttp3_conn *conn, int64_t sid,
|
|||
if(!stream)
|
||||
return 0;
|
||||
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] end_headers, status=%d",
|
||||
stream_id, stream->status_code);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] end_headers, status=%d", stream_id,
|
||||
stream->status_code);
|
||||
|
||||
if(!proxy_ctx->tunnel.has_final_response) {
|
||||
if(stream->status_code / 100 != 1) {
|
||||
|
|
@ -949,7 +940,7 @@ static int cb_h3_proxy_end_headers(nghttp3_conn *conn, int64_t sid,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int cb_h3_proxy_stop_sending(nghttp3_conn *conn, int64_t sid,
|
||||
static int cb_h3_proxy_stop_sending(nghttp3_conn *conn, int64_t stream_id,
|
||||
uint64_t app_error_code, void *user_data,
|
||||
void *stream_user_data)
|
||||
{
|
||||
|
|
@ -961,7 +952,7 @@ static int cb_h3_proxy_stop_sending(nghttp3_conn *conn, int64_t sid,
|
|||
(void)stream_user_data;
|
||||
|
||||
if(ctx) {
|
||||
int rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, 0, sid,
|
||||
int rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, 0, stream_id,
|
||||
app_error_code);
|
||||
|
||||
if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) {
|
||||
|
|
@ -972,7 +963,7 @@ static int cb_h3_proxy_stop_sending(nghttp3_conn *conn, int64_t sid,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int cb_h3_proxy_reset_stream(nghttp3_conn *conn, int64_t sid,
|
||||
static int cb_h3_proxy_reset_stream(nghttp3_conn *conn, int64_t stream_id,
|
||||
uint64_t app_error_code, void *user_data,
|
||||
void *stream_user_data)
|
||||
{
|
||||
|
|
@ -980,7 +971,6 @@ static int cb_h3_proxy_reset_stream(nghttp3_conn *conn, int64_t sid,
|
|||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
struct Curl_easy *data = stream_user_data;
|
||||
int64_t stream_id = sid;
|
||||
int rv;
|
||||
(void)conn;
|
||||
|
||||
|
|
@ -1001,10 +991,12 @@ static int cb_h3_proxy_reset_stream(nghttp3_conn *conn, int64_t sid,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static nghttp3_ssize
|
||||
cb_h3_read_data_for_tunnel_stream(nghttp3_conn *conn, int64_t stream_id,
|
||||
nghttp3_vec *vec, size_t veccnt,
|
||||
uint32_t *pflags, void *user_data,
|
||||
static nghttp3_ssize cb_h3_read_data_for_tunnel_stream(nghttp3_conn *conn,
|
||||
int64_t stream_id,
|
||||
nghttp3_vec *vec,
|
||||
size_t veccnt,
|
||||
uint32_t *pflags,
|
||||
void *user_data,
|
||||
void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
|
|
@ -1098,10 +1090,10 @@ static nghttp3_callbacks ngh3_proxy_callbacks = {
|
|||
NULL, /* recv_origin */
|
||||
NULL, /* end_origin */
|
||||
NULL, /* rand */
|
||||
#endif /* NGHTTP3_CALLBACKS_V2 */
|
||||
#endif
|
||||
#ifdef NGHTTP3_CALLBACKS_V3 /* nghttp3 v1.14.0+ */
|
||||
NULL, /* recv_settings2 */
|
||||
#endif /* NGHTTP3_CALLBACKS_V3 */
|
||||
#endif
|
||||
};
|
||||
|
||||
#if NGTCP2_VERSION_NUM < 0x011100
|
||||
|
|
@ -1111,8 +1103,7 @@ struct cf_ngtcp2_proxy_sfind_ctx {
|
|||
uint32_t mid;
|
||||
};
|
||||
|
||||
static bool cf_ngtcp2_proxy_sfind(uint32_t mid, void *value,
|
||||
void *user_data)
|
||||
static bool cf_ngtcp2_proxy_sfind(uint32_t mid, void *value, void *user_data)
|
||||
{
|
||||
struct cf_ngtcp2_proxy_sfind_ctx *fctx = user_data;
|
||||
struct h3_proxy_stream_ctx *stream = value;
|
||||
|
|
@ -1125,8 +1116,8 @@ static bool cf_ngtcp2_proxy_sfind(uint32_t mid, void *value,
|
|||
return TRUE; /* continue */
|
||||
}
|
||||
|
||||
static struct h3_proxy_stream_ctx *
|
||||
cf_ngtcp2_proxy_get_stream(struct cf_ngtcp2_proxy_ctx *ctx, int64_t stream_id)
|
||||
static struct h3_proxy_stream_ctx *cf_ngtcp2_proxy_get_stream(
|
||||
struct cf_ngtcp2_proxy_ctx *ctx, int64_t stream_id)
|
||||
{
|
||||
struct cf_ngtcp2_proxy_sfind_ctx fctx;
|
||||
fctx.stream_id = stream_id;
|
||||
|
|
@ -1135,8 +1126,8 @@ cf_ngtcp2_proxy_get_stream(struct cf_ngtcp2_proxy_ctx *ctx, int64_t stream_id)
|
|||
return fctx.stream;
|
||||
}
|
||||
#else
|
||||
static struct h3_proxy_stream_ctx *
|
||||
cf_ngtcp2_proxy_get_stream(struct cf_ngtcp2_proxy_ctx *ctx, int64_t stream_id)
|
||||
static struct h3_proxy_stream_ctx *cf_ngtcp2_proxy_get_stream(
|
||||
struct cf_ngtcp2_proxy_ctx *ctx, int64_t stream_id)
|
||||
{
|
||||
struct Curl_easy *data =
|
||||
ngtcp2_conn_get_stream_user_data(ctx->qconn, stream_id);
|
||||
|
|
@ -1204,8 +1195,7 @@ static CURLcode cf_ngtcp2_h3conn_init(struct Curl_cfilter *cf,
|
|||
rc = nghttp3_conn_bind_qpack_streams(ctx->h3conn, qpack_enc_stream_id,
|
||||
qpack_dec_stream_id);
|
||||
if(rc) {
|
||||
failf(data, "error binding HTTP/3 qpack streams: %s",
|
||||
ngtcp2_strerror(rc));
|
||||
failf(data, "error binding HTTP/3 qpack streams: %s", ngtcp2_strerror(rc));
|
||||
return CURLE_QUIC_CONNECT_ERROR;
|
||||
}
|
||||
|
||||
|
|
@ -1260,7 +1250,7 @@ static int cb_ngtcp2_proxy_handshake_completed(ngtcp2_conn *tconn,
|
|||
#ifdef USE_GNUTLS
|
||||
int flags = gnutls_session_get_flags(ctx->tls.gtls.session);
|
||||
ctx->earlydata_accepted = !!(flags & GNUTLS_SFLAGS_EARLY_DATA);
|
||||
#endif /* USE_GNUTLS */
|
||||
#endif
|
||||
#ifdef USE_WOLFSSL
|
||||
#ifdef WOLFSSL_EARLY_DATA
|
||||
ctx->earlydata_accepted =
|
||||
|
|
@ -1270,7 +1260,7 @@ static int cb_ngtcp2_proxy_handshake_completed(ngtcp2_conn *tconn,
|
|||
DEBUGASSERT(0); /* should not come here if ED is disabled. */
|
||||
ctx->earlydata_accepted = FALSE;
|
||||
#endif /* WOLFSSL_EARLY_DATA */
|
||||
#endif /* USE_WOLFSSL */
|
||||
#endif
|
||||
CURL_TRC_CF(data, cf, "server did%s accept %zu bytes of early data",
|
||||
ctx->earlydata_accepted ? "" : " not", ctx->earlydata_skip);
|
||||
Curl_pgrsEarlyData(data, ctx->earlydata_accepted ?
|
||||
|
|
@ -1291,14 +1281,13 @@ static int cb_ngtcp2_proxy_handshake_completed(ngtcp2_conn *tconn,
|
|||
}
|
||||
|
||||
static int cb_ngtcp2_recv_stream_data(ngtcp2_conn *tconn, uint32_t flags,
|
||||
int64_t sid, uint64_t offset,
|
||||
int64_t stream_id, uint64_t offset,
|
||||
const uint8_t *buf, size_t buflen,
|
||||
void *user_data, void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
int64_t stream_id = (int64_t)sid;
|
||||
nghttp3_ssize nconsumed;
|
||||
int fin = (flags & NGTCP2_STREAM_DATA_FLAG_FIN) ? 1 : 0;
|
||||
struct Curl_easy *data = stream_user_data;
|
||||
|
|
@ -1326,9 +1315,8 @@ static int cb_ngtcp2_recv_stream_data(ngtcp2_conn *tconn, uint32_t flags,
|
|||
* including QPACK HEADERS. In other words, it does not consume payload of
|
||||
* DATA frame. */
|
||||
if(nconsumed) {
|
||||
ngtcp2_conn_extend_max_stream_offset(tconn, stream_id,
|
||||
(uint64_t)nconsumed);
|
||||
ngtcp2_conn_extend_max_offset(tconn, (uint64_t)nconsumed);
|
||||
ngtcp2_conn_extend_max_stream_offset(tconn, stream_id, nconsumed);
|
||||
ngtcp2_conn_extend_max_offset(tconn, nconsumed);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -1359,14 +1347,13 @@ static int cb_ngtcp2_acked_stream_data_offset(ngtcp2_conn *tconn,
|
|||
}
|
||||
|
||||
static int cb_ngtcp2_stream_close(ngtcp2_conn *tconn, uint32_t flags,
|
||||
int64_t sid, uint64_t app_error_code,
|
||||
int64_t stream_id, uint64_t app_error_code,
|
||||
void *user_data, void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
struct Curl_easy *data = stream_user_data;
|
||||
int64_t stream_id = (int64_t)sid;
|
||||
int rv;
|
||||
|
||||
(void)tconn;
|
||||
|
|
@ -1382,8 +1369,7 @@ static int cb_ngtcp2_stream_close(ngtcp2_conn *tconn, uint32_t flags,
|
|||
|
||||
rv = nghttp3_conn_close_stream(ctx->h3conn, stream_id, app_error_code);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] quic close(app_error=%"
|
||||
PRIu64 ") -> %d", stream_id, (uint64_t)app_error_code,
|
||||
rv);
|
||||
PRIu64 ") -> %d", stream_id, app_error_code, rv);
|
||||
if(rv && rv != NGHTTP3_ERR_STREAM_NOT_FOUND) {
|
||||
cf_ngtcp2_proxy_h3_err_set(cf, data, rv);
|
||||
return NGTCP2_ERR_CALLBACK_FAILURE;
|
||||
|
|
@ -1403,9 +1389,8 @@ static int cb_ngtcp2_extend_max_local_streams_bidi(ngtcp2_conn *tconn,
|
|||
(void)tconn;
|
||||
ctx->max_bidi_streams = max_streams;
|
||||
if(data)
|
||||
CURL_TRC_CF(data, cf, "max bidi streams now %" PRIu64
|
||||
", used %" PRIu64, (uint64_t)ctx->max_bidi_streams,
|
||||
(uint64_t)ctx->used_bidi_streams);
|
||||
CURL_TRC_CF(data, cf, "max bidi streams now %" PRIu64 ", used %" PRIu64,
|
||||
ctx->max_bidi_streams, ctx->used_bidi_streams);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1466,14 +1451,13 @@ static int cb_ngtcp2_get_new_connection_id2(ngtcp2_conn *tconn,
|
|||
}
|
||||
#endif
|
||||
|
||||
static int cb_ngtcp2_stream_reset(ngtcp2_conn *tconn, int64_t sid,
|
||||
static int cb_ngtcp2_stream_reset(ngtcp2_conn *tconn, int64_t stream_id,
|
||||
uint64_t final_size, uint64_t app_error_code,
|
||||
void *user_data, void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx = proxy_ctx->ngtcp2_ctx;
|
||||
int64_t stream_id = (int64_t)sid;
|
||||
struct Curl_easy *data = stream_user_data;
|
||||
int rv;
|
||||
(void)tconn;
|
||||
|
|
@ -1514,7 +1498,7 @@ static int cb_ngtcp2_extend_max_stream_data(ngtcp2_conn *tconn,
|
|||
stream = H3_PROXY_STREAM_CTX(ctx, s_data);
|
||||
if(stream && stream->quic_flow_blocked) {
|
||||
CURL_TRC_CF(s_data, cf, "[%" PRId64 "] unblock quic flow",
|
||||
(int64_t)stream_id);
|
||||
stream_id);
|
||||
stream->quic_flow_blocked = FALSE;
|
||||
Curl_multi_mark_dirty(s_data);
|
||||
}
|
||||
|
|
@ -1611,13 +1595,13 @@ static ngtcp2_callbacks ngtcp2_proxy_callbacks = {
|
|||
NULL, /* early_data_rejected */
|
||||
#ifdef NGTCP2_CALLBACKS_V2 /* ngtcp2 v1.14.0+ */
|
||||
NULL, /* begin_path_validation */
|
||||
#endif /* NGTCP2_CALLBACKS_V2 */
|
||||
#endif
|
||||
#ifdef NGTCP2_CALLBACKS_V3 /* ngtcp2 v1.22.0+ */
|
||||
NULL, /* recv_stateless_reset2 */
|
||||
cb_ngtcp2_get_new_connection_id2, /* get_new_connection_id2 */
|
||||
NULL, /* dcid_status2 */
|
||||
ngtcp2_crypto_get_path_challenge_data2_cb, /* get_path_challenge_data2 */
|
||||
#endif /* NGTCP2_CALLBACKS_V3 */
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(_MSC_VER) && defined(_DLL)
|
||||
|
|
@ -1642,7 +1626,7 @@ static CURLcode cf_ngtcp2_recv_pkts_proxy(const unsigned char *buf,
|
|||
CURL_TRC_CF(pktx->data, pktx->cf, "vquic_recv(len=%zu, gso=%zu, ecn=%x)",
|
||||
buflen, gso_size, ecn);
|
||||
ngtcp2_addr_init(&path.local, (struct sockaddr *)&ctx->q.local_addr,
|
||||
(socklen_t)ctx->q.local_addrlen);
|
||||
ctx->q.local_addrlen);
|
||||
ngtcp2_addr_init(&path.remote, (struct sockaddr *)remote_addr,
|
||||
remote_addrlen);
|
||||
pi.ecn = (uint8_t)ecn;
|
||||
|
|
@ -1757,11 +1741,11 @@ static CURLcode proxy_read_pkt_to_send(void *userp,
|
|||
else if(n < 0) {
|
||||
switch(n) {
|
||||
case NGTCP2_ERR_STREAM_DATA_BLOCKED: {
|
||||
struct h3_proxy_stream_ctx *stream = NULL;
|
||||
struct h3_proxy_stream_ctx *stream;
|
||||
DEBUGASSERT(ndatalen == -1);
|
||||
nghttp3_conn_block_stream(ctx->h3conn, stream_id);
|
||||
CURL_TRC_CF(x->data, x->cf, "[%" PRId64 "] block quic flow",
|
||||
(int64_t)stream_id);
|
||||
stream_id);
|
||||
stream = cf_ngtcp2_proxy_get_stream(ctx, stream_id);
|
||||
if(stream) /* it might be not one of our h3 streams? */
|
||||
stream->quic_flow_blocked = TRUE;
|
||||
|
|
@ -1969,7 +1953,7 @@ static CURLcode cf_ngtcp2_proxy_shutdown(struct Curl_cfilter *cf,
|
|||
&ctx->last_error, pktx.ts);
|
||||
CURL_TRC_CF(data, cf, "start shutdown(err_type=%d, err_code=%"
|
||||
PRIu64 ") -> %zd", ctx->last_error.type,
|
||||
(uint64_t)ctx->last_error.error_code, (ssize_t)nwritten);
|
||||
ctx->last_error.error_code, (ssize_t)nwritten);
|
||||
/* there are cases listed in ngtcp2 documentation where this call
|
||||
* may fail. Since we are doing a connection shutdown as graceful
|
||||
* as we can, such an error is ignored here. */
|
||||
|
|
@ -2180,8 +2164,8 @@ out:
|
|||
return nread;
|
||||
}
|
||||
|
||||
static struct h3_proxy_stream_ctx *
|
||||
h3_proxy_resolve_send_stream(struct cf_h3_proxy_ctx *proxy_ctx,
|
||||
static struct h3_proxy_stream_ctx *h3_proxy_resolve_send_stream(
|
||||
struct cf_h3_proxy_ctx *proxy_ctx,
|
||||
struct cf_ngtcp2_proxy_ctx *ctx,
|
||||
struct Curl_easy *data)
|
||||
{
|
||||
|
|
@ -2328,8 +2312,7 @@ static CURLcode cf_h3_proxy_recv(struct Curl_cfilter *cf,
|
|||
}
|
||||
|
||||
if(!Curl_bufq_is_empty(&proxy_ctx->inbufq)) {
|
||||
result = Curl_bufq_cread(&proxy_ctx->inbufq,
|
||||
buf, len, pnread);
|
||||
result = Curl_bufq_cread(&proxy_ctx->inbufq, buf, len, pnread);
|
||||
if(result)
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -2340,8 +2323,7 @@ static CURLcode cf_h3_proxy_recv(struct Curl_cfilter *cf,
|
|||
|
||||
/* inbufq had nothing before, maybe after progressing ingress? */
|
||||
if(!*pnread && !Curl_bufq_is_empty(&proxy_ctx->inbufq)) {
|
||||
result = Curl_bufq_cread(&proxy_ctx->inbufq,
|
||||
buf, len, pnread);
|
||||
result = Curl_bufq_cread(&proxy_ctx->inbufq, buf, len, pnread);
|
||||
if(result) {
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] read inbufq(len=%zu) "
|
||||
"-> %zd, %d",
|
||||
|
|
@ -2355,8 +2337,7 @@ static CURLcode cf_h3_proxy_recv(struct Curl_cfilter *cf,
|
|||
}
|
||||
else {
|
||||
if(stream->xfer_result) {
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed",
|
||||
stream->id);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed", stream->id);
|
||||
cf_ngtcp2_proxy_stream_close(cf, data, stream);
|
||||
result = stream->xfer_result;
|
||||
goto out;
|
||||
|
|
@ -2451,7 +2432,7 @@ static void proxy_h3_submit(int64_t *pstream_id,
|
|||
*err = CURLE_SEND_ERROR;
|
||||
goto out;
|
||||
}
|
||||
stream->id = (int64_t)sid;
|
||||
stream->id = sid;
|
||||
++ctx->used_bidi_streams;
|
||||
|
||||
/* Set stream user data in ngtcp2 connection for callbacks */
|
||||
|
|
@ -2668,7 +2649,8 @@ static CURLcode cf_ngtcp2_proxy_adjust_pollset(struct Curl_cfilter *cf,
|
|||
bool c_exhaust, s_exhaust;
|
||||
|
||||
CF_DATA_SAVE(save, cf, data);
|
||||
c_exhaust = want_send && (!ngtcp2_conn_get_cwnd_left(ctx->qconn) ||
|
||||
c_exhaust = want_send &&
|
||||
(!ngtcp2_conn_get_cwnd_left(ctx->qconn) ||
|
||||
!ngtcp2_conn_get_max_data_left(ctx->qconn));
|
||||
s_exhaust = want_send && stream && H3_STREAM_ID(stream) >= 0 &&
|
||||
stream->quic_flow_blocked;
|
||||
|
|
@ -2726,8 +2708,8 @@ static int proxy_quic_ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid)
|
|||
{
|
||||
ngtcp2_crypto_conn_ref *cref;
|
||||
struct Curl_cfilter *cf;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx;
|
||||
struct cf_ngtcp2_proxy_ctx *ctx;
|
||||
struct cf_h3_proxy_ctx *proxy_ctx;
|
||||
struct Curl_easy *data;
|
||||
|
||||
cref = (ngtcp2_crypto_conn_ref *)SSL_get_app_data(ssl);
|
||||
|
|
@ -2751,7 +2733,7 @@ static int proxy_quic_ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid)
|
|||
quic_tp = (unsigned char *)tpbuf;
|
||||
quic_tp_len = (size_t)tplen;
|
||||
}
|
||||
#endif /* HAVE_OPENSSL_EARLYDATA */
|
||||
#endif
|
||||
Curl_ossl_add_session(cf, data, ctx->peer.scache_key, ssl_sessionid,
|
||||
SSL_version(ssl), "h3", quic_tp, quic_tp_len);
|
||||
}
|
||||
|
|
@ -2766,7 +2748,7 @@ static CURLcode cf_ngtcp2_proxy_tls_ctx_setup(struct Curl_cfilter *cf,
|
|||
struct curl_tls_ctx *ctx = user_data;
|
||||
|
||||
#ifdef USE_OPENSSL
|
||||
#if defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC)
|
||||
#if defined(OPENSSL_IS_AWSLC) || defined(OPENSSL_IS_BORINGSSL)
|
||||
if(ngtcp2_crypto_boringssl_configure_client_context(ctx->ossl.ssl_ctx)
|
||||
!= 0) {
|
||||
failf(data, "ngtcp2_crypto_boringssl_configure_client_context failed");
|
||||
|
|
@ -2779,7 +2761,7 @@ static CURLcode cf_ngtcp2_proxy_tls_ctx_setup(struct Curl_cfilter *cf,
|
|||
failf(data, "ngtcp2_crypto_quictls_configure_client_context failed");
|
||||
return CURLE_FAILED_INIT;
|
||||
}
|
||||
#endif
|
||||
#endif /* !OPENSSL_IS_AWSLC && !OPENSSL_IS_BORINGSSL */
|
||||
if(Curl_ssl_scache_use(cf, data)) {
|
||||
SSL_CTX_set_session_cache_mode(ctx->ossl.ssl_ctx,
|
||||
SSL_SESS_CACHE_CLIENT |
|
||||
|
|
@ -2811,24 +2793,24 @@ static CURLcode cf_ngtcp2_proxy_on_session_reuse(struct Curl_cfilter *cf,
|
|||
#ifdef USE_GNUTLS
|
||||
ctx->earlydata_max =
|
||||
gnutls_record_get_max_early_data_size(ctx->tls.gtls.session);
|
||||
#endif /* USE_GNUTLS */
|
||||
#endif
|
||||
#ifdef USE_WOLFSSL
|
||||
#ifdef WOLFSSL_EARLY_DATA
|
||||
ctx->earlydata_max = scs->earlydata_max;
|
||||
#else
|
||||
ctx->earlydata_max = 0;
|
||||
#endif /* WOLFSSL_EARLY_DATA */
|
||||
#endif /* USE_WOLFSSL */
|
||||
#endif
|
||||
#if defined(USE_GNUTLS) || defined(USE_WOLFSSL) || \
|
||||
(defined(USE_OPENSSL) && defined(HAVE_OPENSSL_EARLYDATA))
|
||||
if((!ctx->earlydata_max)) {
|
||||
if(!ctx->earlydata_max) {
|
||||
CURL_TRC_CF(data, cf, "SSL session does not allow earlydata");
|
||||
}
|
||||
else if(!Curl_alpn_contains_proto(alpns, scs->alpn)) {
|
||||
CURL_TRC_CF(data, cf, "SSL session from different ALPN, no early data");
|
||||
}
|
||||
else if(!scs->quic_tp || !scs->quic_tp_len) {
|
||||
CURL_TRC_CF(data, cf, "no 0RTT transport parameters, no early data, ");
|
||||
CURL_TRC_CF(data, cf, "no 0RTT transport parameters, no early data");
|
||||
}
|
||||
else {
|
||||
int rv;
|
||||
|
|
@ -2867,7 +2849,7 @@ static CURLcode cf_h3_proxy_ctx_init(struct Curl_cfilter *cf,
|
|||
CURLcode result = CURLE_OK;
|
||||
const struct Curl_sockaddr_ex *sockaddr = NULL;
|
||||
int qfd;
|
||||
static const struct alpn_spec ALPN_SPEC_H3 = {{ "h3", "h3-29" }, 2};
|
||||
static const struct alpn_spec ALPN_SPEC_H3 = { { "h3", "h3-29" }, 2 };
|
||||
struct proxy_pkt_io_ctx pktx;
|
||||
|
||||
ctx = curlx_calloc(1, sizeof(struct cf_ngtcp2_proxy_ctx));
|
||||
|
|
@ -3023,8 +3005,7 @@ out:
|
|||
return result;
|
||||
}
|
||||
|
||||
static CURLcode
|
||||
h3_proxy_inspect_response(struct Curl_cfilter *cf,
|
||||
static CURLcode h3_proxy_inspect_response(struct Curl_cfilter *cf,
|
||||
struct Curl_easy *data,
|
||||
struct h3_tunnel_stream *ts)
|
||||
{
|
||||
|
|
@ -3126,9 +3107,8 @@ out:
|
|||
|
||||
result = CURLE_COULDNT_CONNECT;
|
||||
if(cerr) {
|
||||
CURL_TRC_CF(data, cf, "connect error, type=%d, code=%"
|
||||
PRIu64,
|
||||
cerr->type, (uint64_t)cerr->error_code);
|
||||
CURL_TRC_CF(data, cf, "connect error, type=%d, code=%" PRIu64,
|
||||
cerr->type, cerr->error_code);
|
||||
switch(cerr->type) {
|
||||
case NGTCP2_CCERR_TYPE_VERSION_NEGOTIATION:
|
||||
CURL_TRC_CF(data, cf, "error in version negotiation");
|
||||
|
|
@ -3242,13 +3222,11 @@ out:
|
|||
return result;
|
||||
}
|
||||
|
||||
static CURLcode
|
||||
cf_h3_proxy_connect(struct Curl_cfilter *cf,
|
||||
struct Curl_easy *data,
|
||||
bool *done)
|
||||
static CURLcode cf_h3_proxy_connect(struct Curl_cfilter *cf,
|
||||
struct Curl_easy *data, bool *done)
|
||||
{
|
||||
struct cf_h3_proxy_ctx *proxy_ctx = cf->ctx;
|
||||
struct cf_call_data save = {0};
|
||||
struct cf_call_data save = { 0 };
|
||||
CURLcode result = CURLE_OK;
|
||||
timediff_t check;
|
||||
struct h3_tunnel_stream *ts = &proxy_ctx->tunnel;
|
||||
|
|
@ -3318,8 +3296,7 @@ static void h3_proxy_data_done(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|||
|
||||
stream = H3_PROXY_STREAM_CTX(ctx, data);
|
||||
if(stream) {
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] easy handle is done",
|
||||
stream->id);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] easy handle is done", stream->id);
|
||||
cf_ngtcp2_proxy_stream_close(cf, data, stream);
|
||||
Curl_uint32_hash_remove(&ctx->streams, data->mid);
|
||||
if(!Curl_uint32_hash_count(&ctx->streams))
|
||||
|
|
@ -3473,6 +3450,3 @@ out:
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* Do not leak this filter's call_data accessor in unity builds. */
|
||||
#undef CF_CTX_CALL_DATA
|
||||
|
|
|
|||
|
|
@ -168,8 +168,8 @@ static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *context)
|
|||
/* Use a larger buffer to work around a bug in NetBSD:
|
||||
https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58039 */
|
||||
unsigned char tmp_digest[CURL_SHA512_256_DIGEST_SIZE * 2];
|
||||
result = EVP_DigestFinal_ex(*ctx,
|
||||
tmp_digest, NULL) ? CURLE_OK : CURLE_SSL_CIPHER;
|
||||
result = EVP_DigestFinal_ex(*ctx, tmp_digest, NULL) ?
|
||||
CURLE_OK : CURLE_SSL_CIPHER;
|
||||
if(result == CURLE_OK)
|
||||
memcpy(digest, tmp_digest, CURL_SHA512_256_DIGEST_SIZE);
|
||||
curlx_memzero(tmp_digest, sizeof(tmp_digest));
|
||||
|
|
|
|||
|
|
@ -338,7 +338,6 @@ static CURLcode http_output_bearer(struct Curl_easy *data)
|
|||
fail:
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3021,6 +3021,3 @@ char *curl_pushheader_byname(struct curl_pushheaders *h, const char *name)
|
|||
}
|
||||
|
||||
#endif /* !CURL_DISABLE_HTTP && USE_NGHTTP2 */
|
||||
|
||||
/* Do not leak this filter's call_data accessor in unity builds. */
|
||||
#undef CF_CTX_CALL_DATA
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ static void my_md5_final(unsigned char *digest, void *ctx)
|
|||
}
|
||||
|
||||
#elif defined(USE_MBEDTLS) && \
|
||||
defined(PSA_WANT_ALG_MD5) && PSA_WANT_ALG_MD5 /* mbedTLS 4+ */
|
||||
defined(PSA_WANT_ALG_MD5) && PSA_WANT_ALG_MD5
|
||||
#include <psa/crypto.h>
|
||||
|
||||
typedef psa_hash_operation_t my_md5_ctx;
|
||||
|
|
|
|||
|
|
@ -46,8 +46,7 @@
|
|||
|
||||
|
||||
/* .netrc is not really a standard. The GNU definition can be found here:
|
||||
* https://www.gnu.org/software/inetutils/manual/\
|
||||
* html_node/The-_002enetrc-file.html
|
||||
* https://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-file.html
|
||||
* This gives grammar like:
|
||||
*
|
||||
* LITERAL := \S+ | QUOTED
|
||||
|
|
@ -132,7 +131,6 @@ static const char *netrc_tokenstr(curl_netrc_token token)
|
|||
return "[???]";
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void netrc_lexer_init(struct netrc_lexer *lexer,
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ static void my_sha256_final(unsigned char *digest, void *ctx)
|
|||
}
|
||||
|
||||
#elif defined(USE_MBEDTLS) && \
|
||||
defined(PSA_WANT_ALG_SHA_256) && PSA_WANT_ALG_SHA_256 /* mbedTLS 4+ */
|
||||
defined(PSA_WANT_ALG_SHA_256) && PSA_WANT_ALG_SHA_256
|
||||
#include <psa/crypto.h>
|
||||
|
||||
typedef psa_hash_operation_t my_sha256_ctx;
|
||||
|
|
|
|||
|
|
@ -958,13 +958,13 @@ static CURLproxycode socks5_recv_resp1(struct socks_ctx *sx,
|
|||
+----+-----+-------+------+----------+----------+
|
||||
|VER | REP | RSV | ATYP | BND.ADDR | BND.PORT |
|
||||
+----+-----+-------+------+----------+----------+
|
||||
| 1 | 1 | X'00' | 1 | Variable | 2 |
|
||||
| 1 | 1 | 0x00 | 1 | Variable | 2 |
|
||||
+----+-----+-------+------+----------+----------+
|
||||
|
||||
ATYP:
|
||||
o IP v4 address: X'01', BND.ADDR = 4 byte
|
||||
o domain name: X'03', BND.ADDR = [ 1 byte length, string ]
|
||||
o IP v6 address: X'04', BND.ADDR = 16 byte
|
||||
o IPv4 address: 0x01, BND.ADDR = 4 byte
|
||||
o domain name: 0x03, BND.ADDR = [ 1 byte length, string ]
|
||||
o IPv6 address: 0x04, BND.ADDR = 16 byte
|
||||
*/
|
||||
if(resp[0] != 5) { /* version */
|
||||
failf(data, "SOCKS5 reply has wrong version, version should be 5.");
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
#include "curl_setup.h"
|
||||
|
||||
#if !defined(CURL_DISABLE_HTTP) && defined(USE_NGTCP2) && defined(USE_NGHTTP3)
|
||||
|
||||
#include <ngtcp2/ngtcp2.h>
|
||||
#include <nghttp3/nghttp3.h>
|
||||
|
||||
#ifdef USE_OPENSSL
|
||||
#include <openssl/err.h>
|
||||
|
|
@ -45,6 +45,8 @@
|
|||
#include "vtls/wolfssl.h"
|
||||
#endif
|
||||
|
||||
#include <nghttp3/nghttp3.h>
|
||||
|
||||
#include "urldata.h"
|
||||
#include "url.h"
|
||||
#include "uint-hash.h"
|
||||
|
|
@ -86,9 +88,9 @@
|
|||
#error H3_STREAM_CHUNK_SIZE smaller than NGTCP2_MAX_UDP_PAYLOAD_SIZE
|
||||
#endif
|
||||
|
||||
/* The pool keeps spares around and half of a full stream windows
|
||||
/* The pool keeps spares around and half of a full stream window
|
||||
* seems good. More does not seem to improve performance.
|
||||
* The benefit of the pool is that stream buffer to not keep
|
||||
* The benefit of the pool is that stream buffers do not keep
|
||||
* spares. Memory consumption goes down when streams run empty,
|
||||
* have a large upload done, etc. */
|
||||
#define H3_STREAM_POOL_SPARES 2
|
||||
|
|
@ -132,7 +134,7 @@ struct cf_ngtcp2_ctx {
|
|||
struct curltime handshake_at; /* time connect handshake finished */
|
||||
struct bufc_pool stream_bufcp; /* chunk pool for streams */
|
||||
struct dynbuf scratch; /* temp buffer for header construction */
|
||||
struct uint_hash streams; /* hash `data->mid` to `h3_stream_ctx` */
|
||||
struct uint_hash streams; /* hash data->mid to h3_stream_ctx */
|
||||
uint64_t used_bidi_streams; /* bidi streams we have opened */
|
||||
uint64_t max_bidi_streams; /* max bidi streams we can open */
|
||||
size_t earlydata_max; /* max amount of early data supported by
|
||||
|
|
@ -432,11 +434,8 @@ static ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref)
|
|||
#ifdef DEBUG_NGTCP2
|
||||
static void quic_printf(void *user_data, const char *fmt, ...)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
struct cf_ngtcp2_ctx *ctx = cf->ctx;
|
||||
|
||||
(void)ctx; /* need an easy handle to infof() message */
|
||||
va_list ap;
|
||||
(void)user_data;
|
||||
va_start(ap, fmt);
|
||||
curl_mvfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
|
|
@ -529,8 +528,7 @@ static int cb_ngtcp2_handshake_completed(ngtcp2_conn *tconn, void *user_data)
|
|||
rp = ngtcp2_conn_get_remote_transport_params(ctx->qconn);
|
||||
CURL_TRC_CF(data, cf, "handshake complete after %" FMT_TIMEDIFF_T
|
||||
"ms, remote transport[max_udp_payload=%" PRIu64
|
||||
", initial_max_data=%" PRIu64
|
||||
"]",
|
||||
", initial_max_data=%" PRIu64 "]",
|
||||
curlx_ptimediff_ms(&ctx->handshake_at, &ctx->started_at),
|
||||
rp->max_udp_payload_size, rp->initial_max_data);
|
||||
}
|
||||
|
|
@ -822,7 +820,8 @@ static int cb_get_new_connection_id(ngtcp2_conn *tconn, ngtcp2_cid *cid,
|
|||
}
|
||||
|
||||
#ifdef NGTCP2_CALLBACKS_V3 /* ngtcp2 v1.22.0+ */
|
||||
static int cb_get_new_connection_id2(ngtcp2_conn *tconn, ngtcp2_cid *cid,
|
||||
static int cb_get_new_connection_id2(
|
||||
ngtcp2_conn *tconn, ngtcp2_cid *cid,
|
||||
struct ngtcp2_stateless_reset_token *token, size_t cidlen, void *user_data)
|
||||
{
|
||||
CURLcode result;
|
||||
|
|
@ -1052,7 +1051,7 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id,
|
|||
static void h3_xfer_write_resp_hd(struct Curl_cfilter *cf,
|
||||
struct Curl_easy *data,
|
||||
struct h3_stream_ctx *stream,
|
||||
const char *buf, size_t blen, bool eos)
|
||||
const char *buf, size_t buflen, bool eos)
|
||||
{
|
||||
/* This function returns no error intentionally, but records
|
||||
* the result at the stream, skipping further writes once the
|
||||
|
|
@ -1061,17 +1060,17 @@ static void h3_xfer_write_resp_hd(struct Curl_cfilter *cf,
|
|||
* send/recv callbacks. Closing the stream here leads to SEND/RECV
|
||||
* errors in other places that then overwrite the transfer's result. */
|
||||
if(!stream->xfer_result) {
|
||||
stream->xfer_result = Curl_xfer_write_resp_hd(data, buf, blen, eos);
|
||||
stream->xfer_result = Curl_xfer_write_resp_hd(data, buf, buflen, eos);
|
||||
if(stream->xfer_result)
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] error %d writing %zu "
|
||||
"bytes of headers", stream->id, stream->xfer_result, blen);
|
||||
"bytes of headers", stream->id, stream->xfer_result, buflen);
|
||||
}
|
||||
}
|
||||
|
||||
static void h3_xfer_write_resp(struct Curl_cfilter *cf,
|
||||
struct Curl_easy *data,
|
||||
struct h3_stream_ctx *stream,
|
||||
const char *buf, size_t blen, bool eos)
|
||||
const char *buf, size_t buflen, bool eos)
|
||||
{
|
||||
/* This function returns no error intentionally, but records
|
||||
* the result at the stream, skipping further writes once the
|
||||
|
|
@ -1080,11 +1079,11 @@ static void h3_xfer_write_resp(struct Curl_cfilter *cf,
|
|||
* send/recv callbacks. Closing the stream here leads to SEND/RECV
|
||||
* errors in other places that then overwrite the transfer's result. */
|
||||
if(!stream->xfer_result) {
|
||||
stream->xfer_result = Curl_xfer_write_resp(data, buf, blen, eos);
|
||||
stream->xfer_result = Curl_xfer_write_resp(data, buf, buflen, eos);
|
||||
/* If the transfer write is errored, we do not want any more data */
|
||||
if(stream->xfer_result) {
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] error %d writing %zu bytes of data",
|
||||
stream->id, stream->xfer_result, blen);
|
||||
stream->id, stream->xfer_result, buflen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1104,8 +1103,7 @@ static void cf_ngtcp2_upd_rx_win(struct Curl_cfilter *cf,
|
|||
if(!stream->rx_offset)
|
||||
return;
|
||||
|
||||
avail = Curl_rlimit_avail(&data->progress.dl.rlimit,
|
||||
Curl_pgrs_now(data));
|
||||
avail = Curl_rlimit_avail(&data->progress.dl.rlimit, Curl_pgrs_now(data));
|
||||
if(avail <= 0) {
|
||||
/* nothing available, do not extend the rx offset */
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] dl rate limit exhausted (%" PRId64
|
||||
|
|
@ -1136,7 +1134,7 @@ static void cf_ngtcp2_upd_rx_win(struct Curl_cfilter *cf,
|
|||
}
|
||||
|
||||
static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,
|
||||
const uint8_t *buf, size_t blen,
|
||||
const uint8_t *buf, size_t buflen,
|
||||
void *user_data, void *stream_user_data)
|
||||
{
|
||||
struct Curl_cfilter *cf = user_data;
|
||||
|
|
@ -1150,15 +1148,15 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,
|
|||
if(!stream)
|
||||
return NGHTTP3_ERR_CALLBACK_FAILURE;
|
||||
|
||||
h3_xfer_write_resp(cf, data, stream, (const char *)buf, blen, FALSE);
|
||||
h3_xfer_write_resp(cf, data, stream, (const char *)buf, buflen, FALSE);
|
||||
|
||||
ngtcp2_conn_extend_max_offset(ctx->qconn, blen);
|
||||
stream->rx_offset += blen;
|
||||
ngtcp2_conn_extend_max_offset(ctx->qconn, buflen);
|
||||
stream->rx_offset += buflen;
|
||||
if(stream->rx_offset_max < stream->rx_offset)
|
||||
stream->rx_offset_max = stream->rx_offset;
|
||||
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] DATA len=%zu, rx win=%" PRIu64,
|
||||
stream->id, blen, stream->rx_offset_max - stream->rx_offset);
|
||||
stream->id, buflen, stream->rx_offset_max - stream->rx_offset);
|
||||
cf_ngtcp2_upd_rx_win(cf, data, stream);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1397,8 +1395,7 @@ static CURLcode init_ngh3_conn(struct Curl_cfilter *cf,
|
|||
rc = nghttp3_conn_bind_qpack_streams(ctx->h3conn, qpack_enc_stream_id,
|
||||
qpack_dec_stream_id);
|
||||
if(rc) {
|
||||
failf(data, "error binding HTTP/3 qpack streams: %s",
|
||||
ngtcp2_strerror(rc));
|
||||
failf(data, "error binding HTTP/3 qpack streams: %s", ngtcp2_strerror(rc));
|
||||
return CURLE_QUIC_CONNECT_ERROR;
|
||||
}
|
||||
|
||||
|
|
@ -1444,7 +1441,7 @@ static CURLcode recv_closed_stream(struct Curl_cfilter *cf,
|
|||
|
||||
/* incoming data frames on the h3 stream */
|
||||
static CURLcode cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
||||
char *buf, size_t blen, size_t *pnread)
|
||||
char *buf, size_t buflen, size_t *pnread)
|
||||
{
|
||||
struct cf_ngtcp2_ctx *ctx = cf->ctx;
|
||||
struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
|
||||
|
|
@ -1455,7 +1452,7 @@ static CURLcode cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
|||
|
||||
(void)ctx;
|
||||
(void)buf;
|
||||
NOVERBOSE((void)blen);
|
||||
NOVERBOSE((void)buflen);
|
||||
|
||||
CF_DATA_SAVE(save, cf, data);
|
||||
DEBUGASSERT(cf->connected);
|
||||
|
|
@ -1510,8 +1507,8 @@ out:
|
|||
if(ctx->tls_vrfy_result)
|
||||
result = ctx->tls_vrfy_result;
|
||||
denied:
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] cf_recv(blen=%zu) -> %d, %zu",
|
||||
stream ? stream->id : -1, blen, result, *pnread);
|
||||
CURL_TRC_CF(data, cf, "[%" PRId64 "] cf_recv(buflen=%zu) -> %d, %zu",
|
||||
stream ? stream->id : -1, buflen, result, *pnread);
|
||||
CF_DATA_RESTORE(cf, save);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -1680,7 +1677,7 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
|
|||
|
||||
rc = ngtcp2_conn_open_bidi_stream(ctx->qconn, &sid, data);
|
||||
if(rc) {
|
||||
failf(data, "can get bidi streams");
|
||||
failf(data, "cannot open bidi streams");
|
||||
result = CURLE_SEND_ERROR;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1958,8 +1955,7 @@ static CURLcode cf_progress_ingress(struct Curl_cfilter *cf,
|
|||
return CURLE_OK;
|
||||
}
|
||||
if(result) {
|
||||
CURL_TRC_CF(data, cf, "ingress, recv from tunnel failed: %d",
|
||||
result);
|
||||
CURL_TRC_CF(data, cf, "ingress, recv from tunnel failed: %d", result);
|
||||
return result;
|
||||
}
|
||||
if(nread == 0) {
|
||||
|
|
@ -2657,7 +2653,7 @@ static CURLcode cf_ngtcp2_on_session_reuse(struct Curl_cfilter *cf,
|
|||
CURL_TRC_CF(data, cf, "SSL session from different ALPN, no early data");
|
||||
}
|
||||
else if(!scs->quic_tp || !scs->quic_tp_len) {
|
||||
CURL_TRC_CF(data, cf, "no 0RTT transport parameters, no early data, ");
|
||||
CURL_TRC_CF(data, cf, "no 0RTT transport parameters, no early data");
|
||||
}
|
||||
else {
|
||||
int rv;
|
||||
|
|
@ -3168,6 +3164,3 @@ out:
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* Do not leak this filter's call_data accessor in unity builds. */
|
||||
#undef CF_CTX_CALL_DATA
|
||||
|
|
|
|||
|
|
@ -255,8 +255,8 @@ static CURLcode send_packet_no_gso(struct Curl_cfilter *cf,
|
|||
VERBOSE(++calls);
|
||||
}
|
||||
out:
|
||||
CURL_TRC_CF(data, cf, "vquic_%s(len=%zu, gso=%zu, calls=%zu)"
|
||||
" -> %d, sent=%zu",
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_%s(len=%zu, gso=%zu, calls=%zu) -> %d, sent=%zu",
|
||||
VQUIC_SEND_METHOD, pktlen, gsolen, calls, result, *psent);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -293,8 +293,8 @@ static CURLcode send_packet_no_gso_cf(struct Curl_cfilter *cf,
|
|||
}
|
||||
|
||||
out:
|
||||
CURL_TRC_CF(data, cf, "vquic_cf_send(len=%zu, gso=%zu, calls=%zu)"
|
||||
" -> %d, sent=%zu",
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_cf_send(len=%zu, gso=%zu, calls=%zu) -> %d, sent=%zu",
|
||||
pktlen, gsolen, calls, result, *psent);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -323,8 +323,8 @@ static CURLcode vquic_send_packets(struct Curl_cfilter *cf,
|
|||
}
|
||||
else {
|
||||
result = do_sendmsg(cf, data, qctx, pkt, pktlen, gsolen, psent);
|
||||
CURL_TRC_CF(data, cf, "vquic_%s(len=%zu, gso=%zu, calls=1)"
|
||||
" -> %d, sent=%zu",
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_%s(len=%zu, gso=%zu, calls=1) -> %d, sent=%zu",
|
||||
VQUIC_SEND_METHOD, pktlen, gsolen, result, *psent);
|
||||
}
|
||||
if(!result)
|
||||
|
|
@ -526,8 +526,9 @@ static CURLcode recvmmsg_packets(struct Curl_cfilter *cf,
|
|||
|
||||
out:
|
||||
if(total_nread || result)
|
||||
CURL_TRC_CF(data, cf, "vquic_recvmmsg(len=%zu, packets=%zu, calls=%zu)"
|
||||
" -> %d", total_nread, pkts, calls, result);
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_recvmmsg(len=%zu, packets=%zu, calls=%zu) -> %d",
|
||||
total_nread, pkts, calls, result);
|
||||
Curl_multi_xfer_sockbuf_release(data, sockbuf);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -607,8 +608,9 @@ static CURLcode recvmsg_packets(struct Curl_cfilter *cf,
|
|||
|
||||
out:
|
||||
if(total_nread || result)
|
||||
CURL_TRC_CF(data, cf, "vquic_recvmsg(len=%zu, packets=%zu, calls=%zu)"
|
||||
" -> %d", total_nread, pkts, calls, result);
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_recvmsg(len=%zu, packets=%zu, calls=%zu) -> %d",
|
||||
total_nread, pkts, calls, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -671,8 +673,9 @@ static CURLcode recvfrom_packets(struct Curl_cfilter *cf,
|
|||
|
||||
out:
|
||||
if(total_nread || result)
|
||||
CURL_TRC_CF(data, cf, "vquic_recvfrom(len=%zu, packets=%zu, calls=%zu)"
|
||||
" -> %d", total_nread, pkts, calls, result);
|
||||
CURL_TRC_CF(data, cf,
|
||||
"vquic_recvfrom(len=%zu, packets=%zu, calls=%zu) -> %d",
|
||||
total_nread, pkts, calls, result);
|
||||
return result;
|
||||
}
|
||||
#endif /* !HAVE_SENDMMSG && !HAVE_SENDMSG */
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
* but vtls.c should ever call or use these functions.
|
||||
*
|
||||
* Note: do not use the GnuTLS' *_t variable type names in this source code,
|
||||
* since they were not present in 1.0.X.
|
||||
* since they were not present in 1.0.x.
|
||||
*/
|
||||
#include "curl_setup.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1563,7 +1563,7 @@ static CURLcode mbedtls_sha256sum(const unsigned char *input,
|
|||
unsigned char *sha256sum,
|
||||
size_t sha256len)
|
||||
{
|
||||
#if defined(PSA_WANT_ALG_SHA_256) && PSA_WANT_ALG_SHA_256 /* mbedTLS 4+ */
|
||||
#if defined(PSA_WANT_ALG_SHA_256) && PSA_WANT_ALG_SHA_256
|
||||
psa_status_t status;
|
||||
size_t sha256len_actual;
|
||||
status = psa_hash_compute(PSA_ALG_SHA_256, input, inputlen,
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ $ write pdsc " end if;"
|
|||
$!
|
||||
$write pdsc " software VMSPORTS ''base' ZLIB ;"
|
||||
$write pdsc -
|
||||
" if (not <software VMSPORTS ''base' ZLIB version minimum V1.2-8>) ;"
|
||||
" if (not <software VMSPORTS ''base' ZLIB version minimum v1.2-8>) ;"
|
||||
$write pdsc " error NEED_ZLIB;"
|
||||
$write pdsc " end if;"
|
||||
$!
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ $! Always link a debug image.
|
|||
$! NOIEEE Do not use IEEE floating point. (Alpha/I64)
|
||||
$! VAX must always use DFLOAT
|
||||
$! NOLARGE Disable large-file support if large file support available.
|
||||
$! (Non-VAX, VMS >= V7.2.)
|
||||
$! (Non-VAX, VMS >= v7.2.)
|
||||
$! NOLDAP Disable LDAP support if LDAP is available.
|
||||
$! NOKERBEROS Disable Kerberos support if Kerberos is available.
|
||||
$! LIST Create C compiler listings and linker maps.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Currently building curl using GNV takes longer than building curl via DCL.
|
|||
The GNV procedure actually uses the same configure and makefiles that
|
||||
Unix builds use.
|
||||
|
||||
Building curl on OpenVMS using GNV requires GNV V2.1-2 or the updated
|
||||
Building curl on OpenVMS using GNV requires GNV v2.1-2 or the updated
|
||||
images that are available via anonymous FTP at encompasserve.org in the gnv
|
||||
directory. It also requires the GNV Bash 4.2.45 kit as an update from the
|
||||
same location or from the sourceforge.net GNV project.
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ curl_gnv_build_steps.txt and other useful information.
|
|||
|
||||
Prerequisites:
|
||||
|
||||
OpenVMS V7.0 or later (any platform)
|
||||
DECC V6.5 or later
|
||||
OpenSSL or hp SSL, if you want SSL support
|
||||
OpenVMS v7.0 or later (any platform)
|
||||
DECC v6.5 or later
|
||||
OpenSSL or HP SSL, if you want SSL support
|
||||
|
||||
What is Here:
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
|
|||
long sts;
|
||||
short chan;
|
||||
|
||||
/* iosbdef.h was not in VAX V7.2 or CC 6.4 */
|
||||
/* iosbdef.h was not in VAX v7.2 or CC 6.4 */
|
||||
struct _isb {
|
||||
short int iosb$w_status; /* status */
|
||||
short int iosb$w_bcnt; /* byte count */
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ class TestWebsockets:
|
|||
r.check_exit_code(0)
|
||||
|
||||
# Send large frames and simulate send blocking on 8192 bytes chunks
|
||||
# Simlates error reported in #15865
|
||||
# Simulates error reported in #15865
|
||||
@pytest.mark.parametrize("model", [
|
||||
pytest.param(1, id='multi_perform'),
|
||||
pytest.param(2, id='curl_ws_send+recv'),
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ class EnvConfig:
|
|||
return self._h2o_version
|
||||
|
||||
@property
|
||||
def tcpdmp(self) -> Optional[str]:
|
||||
def tcpdump(self) -> Optional[str]:
|
||||
return self._tcpdump
|
||||
|
||||
def clear_locks(self):
|
||||
|
|
@ -677,7 +677,7 @@ class Env:
|
|||
|
||||
@staticmethod
|
||||
def tcpdump() -> Optional[str]:
|
||||
return Env.CONFIG.tcpdmp
|
||||
return Env.CONFIG.tcpdump
|
||||
|
||||
def __init__(self, pytestconfig=None, env_config=None):
|
||||
if env_config:
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static const struct testcase get_parts_list[] = {
|
|||
"http://-atest/",
|
||||
"http | [11] | [12] | [13] | -atest | [15] | / | [16] | [17]",
|
||||
0, 0, CURLUE_OK },
|
||||
{ /* Multiple trailing dots is not okey */
|
||||
{ /* Multiple trailing dots is not okay */
|
||||
"http://example.com../",
|
||||
"",
|
||||
0, 0, CURLUE_BAD_HOSTNAME },
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ init_failed:
|
|||
return result; /* failure */
|
||||
}
|
||||
|
||||
static CURLcode run1648(CURL *curl, const char *url, const char *userpwd)
|
||||
static CURLcode run1648(CURL *curl, const char *url, const char *proxy)
|
||||
{
|
||||
CURLcode result = CURLE_OK;
|
||||
|
||||
result = init1648(curl, url, userpwd);
|
||||
result = init1648(curl, url, proxy);
|
||||
if(result)
|
||||
return result;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
* "password [string]" - the password that must match (if method is 2)
|
||||
* "backend [IPv4]" - numerical IPv4 address of backend to connect to
|
||||
* "backendport [number:0]" - TCP port of backend to connect to. 0 means use
|
||||
the client's specified port number.
|
||||
* the client's specified port number.
|
||||
* "method [number: 0]" - connect method to respond with:
|
||||
* 0 - no auth
|
||||
* 1 - GSSAPI (not supported)
|
||||
|
|
@ -164,9 +164,9 @@ static void socksd_getconfig(void)
|
|||
logmsg("password [%s] set", s_config.password);
|
||||
}
|
||||
/* Methods:
|
||||
o X'00' NO AUTHENTICATION REQUIRED
|
||||
o X'01' GSSAPI
|
||||
o X'02' USERNAME/PASSWORD
|
||||
o 0x00 NO AUTHENTICATION REQUIRED
|
||||
o 0x01 GSSAPI
|
||||
o 0x02 USERNAME/PASSWORD
|
||||
*/
|
||||
else if(!strcmp(key, "method")) {
|
||||
pval = value;
|
||||
|
|
@ -441,9 +441,9 @@ static curl_socket_t sockit(curl_socket_t fd)
|
|||
return CURL_SOCKET_BAD;
|
||||
}
|
||||
/* ATYP:
|
||||
o IP V4 address: X'01'
|
||||
o DOMAINNAME: X'03'
|
||||
o IP V6 address: X'04'
|
||||
o IPv4 address: 0x01
|
||||
o domain name: 0x03
|
||||
o IPv6 address: 0x04
|
||||
*/
|
||||
type = buffer[SOCKS5_ATYP];
|
||||
address = &buffer[SOCKS5_DSTADDR];
|
||||
|
|
@ -523,16 +523,16 @@ static curl_socket_t sockit(curl_socket_t fd)
|
|||
|
||||
/*
|
||||
o REP Reply field:
|
||||
o X'00' succeeded
|
||||
o X'01' general SOCKS server failure
|
||||
o X'02' connection not allowed by ruleset
|
||||
o X'03' Network unreachable
|
||||
o X'04' Host unreachable
|
||||
o X'05' Connection refused
|
||||
o X'06' TTL expired
|
||||
o X'07' Command not supported
|
||||
o X'08' Address type not supported
|
||||
o X'09' to X'FF' unassigned
|
||||
o 0x00 succeeded
|
||||
o 0x01 general SOCKS server failure
|
||||
o 0x02 connection not allowed by ruleset
|
||||
o 0x03 Network unreachable
|
||||
o 0x04 Host unreachable
|
||||
o 0x05 Connection refused
|
||||
o 0x06 TTL expired
|
||||
o 0x07 Command not supported
|
||||
o 0x08 Address type not supported
|
||||
o 0x09 to 0xFF unassigned
|
||||
*/
|
||||
response[SOCKS5_REP] = rep;
|
||||
response[SOCKS5_RESERVED] = 0; /* must be zero */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue