diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2021-02-01 02:40:42 -0500 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-02-02 08:19:12 +0100 |
| commit | fc9d3444d1a72e2e1865006d13fe8e604abba4a2 (patch) | |
| tree | 04bdd67d72f46febd9b716196b26c89ceafd4644 | |
| parent | 2c4b338f7e45f1ef8d13211a1730f167014c0c58 (diff) | |
| download | curl-fc9d3444d1a72e2e1865006d13fe8e604abba4a2.tar.gz | |
ngtcp2: Fix build error due to change in ngtcp2_settings
- 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
| -rw-r--r-- | lib/vquic/ngtcp2.c | 18 | ||||
| -rw-r--r-- | lib/vquic/ngtcp2.h | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lib/vquic/ngtcp2.c b/lib/vquic/ngtcp2.c index f8b338b3b..d4d0e8bf4 100644 --- a/lib/vquic/ngtcp2.c +++ b/lib/vquic/ngtcp2.c @@ -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; diff --git a/lib/vquic/ngtcp2.h b/lib/vquic/ngtcp2.h index 102ff22e1..8b6f57029 100644 --- a/lib/vquic/ngtcp2.h +++ b/lib/vquic/ngtcp2.h @@ -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; |