summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-12-09 23:31:23 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-12-09 23:31:23 +0100
commit48ef06788f865303847877dfb3f05fc65e7b3271 (patch)
tree0254a23d16572505230bc10e2262b4311bfdd7a7
parent98dc9178699b102a9fc922891ce0614d261d38c5 (diff)
downloadcurl-bagder/ngtcp2-dec9.tar.gz
ngtcp2: make it build it current master againbagder/ngtcp2-dec9
-rw-r--r--lib/vquic/ngtcp2.c6
-rw-r--r--lib/vquic/ngtcp2.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/vquic/ngtcp2.c b/lib/vquic/ngtcp2.c
index 0f2fea0af..5a017b622 100644
--- a/lib/vquic/ngtcp2.c
+++ b/lib/vquic/ngtcp2.c
@@ -717,7 +717,7 @@ static int cb_get_new_connection_id(ngtcp2_conn *tconn, ngtcp2_cid *cid,
return 0;
}
-static ngtcp2_conn_callbacks ng_callbacks = {
+static ngtcp2_callbacks ng_callbacks = {
ngtcp2_crypto_client_initial_cb,
NULL, /* recv_client_initial */
cb_recv_crypto_data,
@@ -1134,7 +1134,7 @@ static int cb_h3_send_stop_sending(nghttp3_conn *conn, int64_t stream_id,
return 0;
}
-static nghttp3_conn_callbacks ngh3_callbacks = {
+static nghttp3_callbacks ngh3_callbacks = {
cb_h3_acked_stream_data, /* acked_stream_data */
cb_h3_stream_close,
cb_h3_recv_data,
@@ -1166,7 +1166,7 @@ static int init_ngh3_conn(struct quicsocket *qs)
return CURLE_QUIC_CONNECT_ERROR;
}
- nghttp3_conn_settings_default(&qs->h3settings);
+ nghttp3_settings_default(&qs->h3settings);
rc = nghttp3_conn_client_new(&qs->h3conn,
&ngh3_callbacks,
diff --git a/lib/vquic/ngtcp2.h b/lib/vquic/ngtcp2.h
index c6d4d12e6..102ff22e1 100644
--- a/lib/vquic/ngtcp2.h
+++ b/lib/vquic/ngtcp2.h
@@ -62,7 +62,7 @@ struct quicsocket {
socklen_t local_addrlen;
nghttp3_conn *h3conn;
- nghttp3_conn_settings h3settings;
+ nghttp3_settings h3settings;
int qlogfd;
};