From: Yusuke Nakamura Date: Sat, 30 Apr 2022 08:51:09 +0000 (+0200) Subject: msh3: psss remote_port to MsH3ConnectionOpen X-Git-Tag: curl-7_83_1~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=279dfb620bb68c54accb5583435729cfb5f41341;p=thirdparty%2Fcurl.git msh3: psss remote_port to MsH3ConnectionOpen MsH3 supported additional "Port" parameter to connect not hosted on 443 port QUIC website. * https://github.com/nibanks/msh3/releases/tag/v0.3.0 * https://github.com/nibanks/msh3/pull/37 Closes #8762 --- diff --git a/docs/HTTP3.md b/docs/HTTP3.md index 6cdadf312f..d56c568aa6 100644 --- a/docs/HTTP3.md +++ b/docs/HTTP3.md @@ -144,7 +144,7 @@ Build curl: Build msh3: - % git clone -b v0.1.0 --single-branch --recursive https://github.com/nibanks/msh3 + % git clone -b v0.3.0 --single-branch --recursive https://github.com/nibanks/msh3 % cd msh3 && mkdir build && cd build % cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo .. % cmake --build . @@ -165,7 +165,7 @@ Run from `/usr/local/bin/curl`. Build msh3: - % git clone -b v0.2.0 --single-branch --recursive https://github.com/nibanks/msh3 + % git clone -b v0.3.0 --single-branch --recursive https://github.com/nibanks/msh3 % cd msh3 && mkdir build && cd build % cmake -G 'Visual Studio 17 2022' -DCMAKE_BUILD_TYPE=RelWithDebInfo .. % cmake --build . --config Release diff --git a/lib/vquic/msh3.c b/lib/vquic/msh3.c index 6b710e81f4..798ba0b774 100644 --- a/lib/vquic/msh3.c +++ b/lib/vquic/msh3.c @@ -95,7 +95,7 @@ static const MSH3_REQUEST_IF msh3_request_if = { void Curl_quic_ver(char *p, size_t len) { - (void)msnprintf(p, len, "msh3/%s", "0.0.1"); + (void)msnprintf(p, len, "msh3/%s", "0.3.0"); } CURLcode Curl_quic_connect(struct Curl_easy *data, @@ -121,7 +121,10 @@ CURLcode Curl_quic_connect(struct Curl_easy *data, return CURLE_FAILED_INIT; } - qs->conn = MsH3ConnectionOpen(qs->api, conn->host.name, unsecure); + qs->conn = MsH3ConnectionOpen(qs->api, + conn->host.name, + (uint16_t)conn->remote_port, + unsecure); if(!qs->conn) { failf(data, "can't create msh3 connection"); if(qs->api) {