1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00

quiche: advertise draft 28 support

Fix the verbose message while at it, quiche currently supports draft
27 and draft 28 simultaneously.

Closes #5518
This commit is contained in:
Peter Wu 2020-06-04 11:54:01 +02:00
parent c048dd0b7c
commit ceab0febd0
2 changed files with 15 additions and 3 deletions

View File

@ -51,7 +51,7 @@
#define MAX_ALTSVC_ALPNLEN 10 #define MAX_ALTSVC_ALPNLEN 10
#if defined(USE_QUICHE) && !defined(UNITTESTS) #if defined(USE_QUICHE) && !defined(UNITTESTS)
#define H3VERSION "h3-27" #define H3VERSION "h3-28"
#elif defined(USE_NGTCP2) && !defined(UNITTESTS) #elif defined(USE_NGTCP2) && !defined(UNITTESTS)
#define H3VERSION "h3-28" #define H3VERSION "h3-28"
#else #else

View File

@ -234,8 +234,20 @@ CURLcode Curl_quic_connect(struct connectdata *conn, curl_socket_t sockfd,
/* for connection reuse purposes: */ /* for connection reuse purposes: */
conn->ssl[FIRSTSOCKET].state = ssl_connection_complete; 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; return CURLE_OK;
} }