moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-11 05:58:01 -05:00
Code Issues Releases Wiki Activity

ngtcp2: Fix build error due to change in ngtcp2_settings

Browse Source 
- Separate ngtcp2_transport_params.

ngtcp2/ngtcp2@05d7adc made ngtcp2_transport_params separate from
ngtcp2_settings.

ngtcp2 master is required to build curl with http3 support.

Closes #6554
This commit is contained in:
Jay Satiro 2021-02-01 02:40:42 -05:00 committed by Daniel Stenberg
parent 2c4b338f7e
commit fc9d3444d1
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/vquic/ngtcp2.c
View File

@ -170,20 +170,22 @@ static void quic_settings(struct quicsocket *qs,
uint64_t stream_buffer_size)
{
ngtcp2_settings *s = &qs->settings;
ngtcp2_transport_params *t = &qs->transport_params;
ngtcp2_settings_default(s);
ngtcp2_transport_params_default(t);
#ifdef DEBUG_NGTCP2
s->log_printf = quic_printf;
#else
s->log_printf = NULL;
#endif
s->initial_ts = timestamp();
s->transport_params.initial_max_stream_data_bidi_local = stream_buffer_size;
s->transport_params.initial_max_stream_data_bidi_remote = QUIC_MAX_STREAMS;
s->transport_params.initial_max_stream_data_uni = QUIC_MAX_STREAMS;
s->transport_params.initial_max_data = QUIC_MAX_DATA;
s->transport_params.initial_max_streams_bidi = 1;
s->transport_params.initial_max_streams_uni = 3;
s->transport_params.max_idle_timeout = QUIC_IDLE_TIMEOUT;
t->initial_max_stream_data_bidi_local = stream_buffer_size;
t->initial_max_stream_data_bidi_remote = QUIC_MAX_STREAMS;
t->initial_max_stream_data_uni = QUIC_MAX_STREAMS;
t->initial_max_data = QUIC_MAX_DATA;
t->initial_max_streams_bidi = 1;
t->initial_max_streams_uni = 3;
t->max_idle_timeout = QUIC_IDLE_TIMEOUT;
if(qs->qlogfd != -1) {
s->qlog.write = qlog_callback;
}
@ -810,7 +812,7 @@ CURLcode Curl_quic_connect(struct Curl_easy *data,
rc = ngtcp2_conn_client_new(&qs->qconn, &qs->dcid, &qs->scid, &path,
NGTCP2_PROTO_VER_MIN, &ng_callbacks,
&qs->settings, NULL, qs);
&qs->settings, &qs->transport_params, NULL, qs);
if(rc)
return CURLE_QUIC_CONNECT_ERROR;

1
lib/vquic/ngtcp2.h
View File

@ -48,6 +48,7 @@ struct quicsocket {
ngtcp2_cid scid;
uint32_t version;
ngtcp2_settings settings;
ngtcp2_transport_params transport_params;
#ifdef USE_OPENSSL
SSL_CTX *sslctx;
SSL *ssl;