luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ngtcp2: build with 0.16.0 and nghttp3 0.12.0

Browse Source 
- moved to qlog_write
- crypto => encryption
- CRYPTO => ENCRYPTION
- removed "_is_"
- ngtcp2_conn_shutdown_stream_read and
  ngtcp2_conn_shutdown_stream_write got flag arguments
- the nghttp3_callbacks struct got a recv_settings callback

Closes #11184
This commit is contained in:
Daniel Stenberg 2023-06-04 23:14:41 +02:00
parent ad8a8e048e
commit cae9d10be3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vquic/curl_ngtcp2.c
View File

@ -328,7 +328,7 @@ static void quic_settings(struct cf_ngtcp2_ctx *ctx,
t->initial_max_streams_uni = QUIC_MAX_STREAMS; t->initial_max_streams_uni = QUIC_MAX_STREAMS;
t->max_idle_timeout = QUIC_IDLE_TIMEOUT; t->max_idle_timeout = QUIC_IDLE_TIMEOUT;
if(ctx->qlogfd != -1) { if(ctx->qlogfd != -1) {
s->qlog.write = qlog_callback; s->qlog_write = qlog_callback;
} }
} }
@ -903,13 +903,13 @@ static int cb_get_new_connection_id(ngtcp2_conn *tconn, ngtcp2_cid *cid,
return 0; return 0;
} }
static int cb_recv_rx_key(ngtcp2_conn *tconn, ngtcp2_crypto_level level, static int cb_recv_rx_key(ngtcp2_conn *tconn, ngtcp2_encryption_level level,
void *user_data) void *user_data)
{ {
struct Curl_cfilter *cf = user_data; struct Curl_cfilter *cf = user_data;
(void)tconn; (void)tconn;
if(level != NGTCP2_CRYPTO_LEVEL_APPLICATION) { if(level != NGTCP2_ENCRYPTION_LEVEL_1RTT) {
return 0; return 0;
} }
@ -1208,7 +1208,8 @@ static int cb_h3_stop_sending(nghttp3_conn *conn, int64_t stream_id,
(void)conn; (void)conn;
(void)stream_user_data; (void)stream_user_data;
rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, stream_id, app_error_code); rv = ngtcp2_conn_shutdown_stream_read(ctx->qconn, 0, stream_id,
app_error_code);
if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) { if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) {
return NGTCP2_ERR_CALLBACK_FAILURE; return NGTCP2_ERR_CALLBACK_FAILURE;
} }
@ -1226,7 +1227,7 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int64_t stream_id,
(void)conn; (void)conn;
(void)data; (void)data;
rv = ngtcp2_conn_shutdown_stream_write(ctx->qconn, stream_id, rv = ngtcp2_conn_shutdown_stream_write(ctx->qconn, 0, stream_id,
app_error_code); app_error_code);
DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] reset -> %d", stream_id, rv)); DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] reset -> %d", stream_id, rv));
if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) { if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) {
@ -1250,7 +1251,8 @@ static nghttp3_callbacks ngh3_callbacks = {
cb_h3_stop_sending, cb_h3_stop_sending,
NULL, /* end_stream */ NULL, /* end_stream */
cb_h3_reset_stream, cb_h3_reset_stream,
NULL /* shutdown */ NULL, /* shutdown */
NULL /* recv_settings */
}; };
static int init_ngh3_conn(struct Curl_cfilter *cf) static int init_ngh3_conn(struct Curl_cfilter *cf)
@ -2403,7 +2405,7 @@ static CURLcode cf_ngtcp2_connect(struct Curl_cfilter *cf,
out: out:
if(result == CURLE_RECV_ERROR && ctx->qconn && if(result == CURLE_RECV_ERROR && ctx->qconn &&
ngtcp2_conn_is_in_draining_period(ctx->qconn)) { ngtcp2_conn_in_draining_period(ctx->qconn)) {
/* When a QUIC server instance is shutting down, it may send us a /* When a QUIC server instance is shutting down, it may send us a
* CONNECTION_CLOSE right away. Our connection then enters the DRAINING * CONNECTION_CLOSE right away. Our connection then enters the DRAINING
* state. * state.