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

ngtcp2: fix build with ngtcp2 and nghttp3

Browse Source 
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
This commit is contained in:
Tatsuhiro Tsujikawa 2021-09-12 15:27:33 +09:00 committed by Daniel Stenberg
parent dbe693e769
commit 24a7cbe9d2
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2677,7 +2677,7 @@ if test X"$want_tcp2" != Xno; then
if test "x$cross_compiling" != "xyes"; then if test "x$cross_compiling" != "xyes"; then
DIR_TCP2=`echo $LD_TCP2 | $SED -e 's/^-L//'` DIR_TCP2=`echo $LD_TCP2 | $SED -e 's/^-L//'`
fi fi
AC_CHECK_LIB(ngtcp2, ngtcp2_conn_client_new, AC_CHECK_LIB(ngtcp2, ngtcp2_conn_client_new_versioned,
[ [
AC_CHECK_HEADERS(ngtcp2/ngtcp2.h, AC_CHECK_HEADERS(ngtcp2/ngtcp2.h,
NGTCP2_ENABLED=1 NGTCP2_ENABLED=1
@ -2876,7 +2876,7 @@ if test X"$want_nghttp3" != Xno; then
if test "x$cross_compiling" != "xyes"; then if test "x$cross_compiling" != "xyes"; then
DIR_NGHTTP3=`echo $LD_NGHTTP3 | $SED -e 's/^-L//'` DIR_NGHTTP3=`echo $LD_NGHTTP3 | $SED -e 's/^-L//'`
fi fi
AC_CHECK_LIB(nghttp3, nghttp3_conn_client_new, AC_CHECK_LIB(nghttp3, nghttp3_conn_client_new_versioned,
[ [
AC_CHECK_HEADERS(nghttp3/nghttp3.h, AC_CHECK_HEADERS(nghttp3/nghttp3.h,
curl_h3_msg="enabled (ngtcp2 + nghttp3)" curl_h3_msg="enabled (ngtcp2 + nghttp3)"

8
lib/vquic/ngtcp2.c
View File

@ -559,8 +559,8 @@ cb_acked_stream_data_offset(ngtcp2_conn *tconn, int64_t stream_id,
return 0; return 0;
} }
static int cb_stream_close(ngtcp2_conn *tconn, int64_t stream_id, static int cb_stream_close(ngtcp2_conn *tconn, uint32_t flags,
uint64_t app_error_code, int64_t stream_id, uint64_t app_error_code,
void *user_data, void *stream_user_data) void *user_data, void *stream_user_data)
{ {
struct quicsocket *qs = (struct quicsocket *)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; (void)stream_user_data;
/* stream is closed... */ /* 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, rv = nghttp3_conn_close_stream(qs->h3conn, stream_id,
app_error_code); app_error_code);
if(rv) { if(rv) {