diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2021-09-12 15:27:33 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-12 12:34:32 +0200 |
| commit | 24a7cbe9d22cb1783a33b94288b656191b0e4375 (patch) | |
| tree | d54951264faf096320e67ccf310ec733fe65f41b | |
| parent | dbe693e76973a12dfe39466c10cd83922813feef (diff) | |
| download | curl-24a7cbe9d22cb1783a33b94288b656191b0e4375.tar.gz | |
ngtcp2: fix build with ngtcp2 and nghttp3
ngtcp2_conn_client_new and nghttp3_conn_client_new are now macros.
Check the wrapped functions instead.
ngtcp2_stream_close callback now takes flags parameter.
Closes #7709
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lib/vquic/ngtcp2.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 34ec0efd3..152b0472e 100644 --- a/configure.ac +++ b/configure.ac @@ -2677,7 +2677,7 @@ if test X"$want_tcp2" != Xno; then if test "x$cross_compiling" != "xyes"; then DIR_TCP2=`echo $LD_TCP2 | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(ngtcp2, ngtcp2_conn_client_new, + AC_CHECK_LIB(ngtcp2, ngtcp2_conn_client_new_versioned, [ AC_CHECK_HEADERS(ngtcp2/ngtcp2.h, NGTCP2_ENABLED=1 @@ -2876,7 +2876,7 @@ if test X"$want_nghttp3" != Xno; then if test "x$cross_compiling" != "xyes"; then DIR_NGHTTP3=`echo $LD_NGHTTP3 | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(nghttp3, nghttp3_conn_client_new, + AC_CHECK_LIB(nghttp3, nghttp3_conn_client_new_versioned, [ AC_CHECK_HEADERS(nghttp3/nghttp3.h, curl_h3_msg="enabled (ngtcp2 + nghttp3)" diff --git a/lib/vquic/ngtcp2.c b/lib/vquic/ngtcp2.c index 776cdc069..9fcfe81a8 100644 --- a/lib/vquic/ngtcp2.c +++ b/lib/vquic/ngtcp2.c @@ -559,8 +559,8 @@ cb_acked_stream_data_offset(ngtcp2_conn *tconn, int64_t stream_id, return 0; } -static int cb_stream_close(ngtcp2_conn *tconn, int64_t stream_id, - uint64_t app_error_code, +static int cb_stream_close(ngtcp2_conn *tconn, uint32_t flags, + int64_t stream_id, uint64_t app_error_code, void *user_data, void *stream_user_data) { struct quicsocket *qs = (struct quicsocket *)user_data; @@ -569,6 +569,10 @@ static int cb_stream_close(ngtcp2_conn *tconn, int64_t stream_id, (void)stream_user_data; /* stream is closed... */ + if(!(flags & NGTCP2_STREAM_CLOSE_FLAG_APP_ERROR_CODE_SET)) { + app_error_code = NGHTTP3_H3_NO_ERROR; + } + rv = nghttp3_conn_close_stream(qs->h3conn, stream_id, app_error_code); if(rv) { |