diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2020-06-04 11:54:01 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2020-06-04 22:07:56 +0200 |
| commit | ceab0febd06e0dfe4f608bbe55242227a9c9d9c9 (patch) | |
| tree | c114be6a487a4b84eebdbb1463e8e2a4e60d02fe | |
| parent | c048dd0b7c83f9db08d7ad85522b629458e35dd6 (diff) | |
quiche: advertise draft 28 support
Fix the verbose message while at it, quiche currently supports draft
27 and draft 28 simultaneously.
Closes #5518
| -rw-r--r-- | lib/altsvc.c | 2 | ||||
| -rw-r--r-- | lib/vquic/quiche.c | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/altsvc.c b/lib/altsvc.c index 371efa275..c9566c216 100644 --- a/lib/altsvc.c +++ b/lib/altsvc.c @@ -51,7 +51,7 @@ #define MAX_ALTSVC_ALPNLEN 10 #if defined(USE_QUICHE) && !defined(UNITTESTS) -#define H3VERSION "h3-27" +#define H3VERSION "h3-28" #elif defined(USE_NGTCP2) && !defined(UNITTESTS) #define H3VERSION "h3-28" #else diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c index f93e95ee1..436249522 100644 --- a/lib/vquic/quiche.c +++ b/lib/vquic/quiche.c @@ -234,8 +234,20 @@ CURLcode Curl_quic_connect(struct connectdata *conn, curl_socket_t sockfd, /* for connection reuse purposes: */ conn->ssl[FIRSTSOCKET].state = ssl_connection_complete; - infof(data, "Sent QUIC client Initial, ALPN: %s\n", - QUICHE_H3_APPLICATION_PROTOCOL + 1); + { + unsigned char alpn_protocols[] = QUICHE_H3_APPLICATION_PROTOCOL; + unsigned alpn_len, offset = 0; + + /* Replace each ALPN length prefix by a comma. */ + while(offset < sizeof(alpn_protocols) - 1) { + alpn_len = alpn_protocols[offset]; + alpn_protocols[offset] = ','; + offset += 1 + alpn_len; + } + + infof(data, "Sent QUIC client Initial, ALPN: %s\n", + alpn_protocols + 1); + } return CURLE_OK; } |