mirror of
https://github.com/open-goal/jak-project
synced 2026-09-07 19:40:48 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
302 lines
8.3 KiB
C
Vendored
Generated
302 lines
8.3 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h> /* for htons() */
|
|
#endif
|
|
|
|
#include <curl/curl.h>
|
|
#include "urldata.h"
|
|
#include "curlx/dynbuf.h"
|
|
#include "cfilters.h"
|
|
#include "curl_trc.h"
|
|
#include "bufq.h"
|
|
#include "vquic/capsule.h"
|
|
|
|
|
|
/**
|
|
* Convert 64-bit value from network byte order to host byte order
|
|
*/
|
|
static uint64_t capsule_ntohll(uint64_t value)
|
|
{
|
|
#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
|
|
return value;
|
|
#elif (defined(__GNUC__) || defined(__clang__)) && \
|
|
defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
|
|
return __builtin_bswap64(value);
|
|
#else
|
|
union {
|
|
uint64_t u64;
|
|
uint32_t u32[2];
|
|
} src, dst;
|
|
|
|
src.u64 = value;
|
|
dst.u32[0] = ntohl(src.u32[1]);
|
|
dst.u32[1] = ntohl(src.u32[0]);
|
|
return dst.u64;
|
|
#endif
|
|
}
|
|
|
|
/**
|
|
* Encode a variable-length integer into a plain buffer.
|
|
* @param buf Output buffer (must have at least 8 bytes)
|
|
* @param value Value to encode (must be <= 0x3FFFFFFFFFFFFFFF)
|
|
* @return Number of bytes written
|
|
*/
|
|
static size_t capsule_encode_varint_buf(uint8_t *buf, uint64_t value)
|
|
{
|
|
DEBUGASSERT(value <= 0x3FFFFFFFFFFFFFFF);
|
|
|
|
if(value <= 0x3F) {
|
|
buf[0] = (uint8_t)value;
|
|
return 1;
|
|
}
|
|
else if(value <= 0x3FFF) {
|
|
uint16_t encoded = (uint16_t)value & 0x3FFF;
|
|
encoded = ntohs(encoded | 0x4000);
|
|
memcpy(buf, &encoded, 2);
|
|
return 2;
|
|
}
|
|
else if(value <= 0x3FFFFFFF) {
|
|
uint32_t encoded = (uint32_t)value & 0x3FFFFFFF;
|
|
encoded = ntohl(encoded | 0x80000000);
|
|
memcpy(buf, &encoded, 4);
|
|
return 4;
|
|
}
|
|
else {
|
|
uint64_t encoded = (uint64_t)value & 0x3FFFFFFFFFFFFFFF;
|
|
encoded = capsule_ntohll(encoded | 0xC000000000000000);
|
|
memcpy(buf, &encoded, 8);
|
|
return 8;
|
|
}
|
|
}
|
|
|
|
static CURLcode capsule_peek_u8(struct bufq *recvbufq,
|
|
size_t offset,
|
|
uint8_t *pbyte)
|
|
{
|
|
const unsigned char *peek = NULL;
|
|
size_t peeklen = 0;
|
|
|
|
if(!Curl_bufq_peek_at(recvbufq, offset, &peek, &peeklen) || !peeklen)
|
|
return CURLE_AGAIN;
|
|
*pbyte = peek[0];
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode capsule_decode_varint_at(struct bufq *recvbufq,
|
|
size_t offset,
|
|
uint64_t *pvalue,
|
|
size_t *pconsumed)
|
|
{
|
|
uint8_t first_byte, byte;
|
|
uint64_t value;
|
|
size_t nbytes;
|
|
size_t i;
|
|
CURLcode result;
|
|
|
|
result = capsule_peek_u8(recvbufq, offset, &first_byte);
|
|
if(result)
|
|
return result;
|
|
|
|
nbytes = (size_t)1 << (first_byte >> 6); /* 1, 2, 4 or 8 bytes */
|
|
value = first_byte & 0x3F;
|
|
|
|
for(i = 1; i < nbytes; ++i) {
|
|
result = capsule_peek_u8(recvbufq, offset + i, &byte);
|
|
if(result)
|
|
return result;
|
|
value = (value << 8) | byte;
|
|
}
|
|
|
|
*pvalue = value;
|
|
*pconsumed = nbytes;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/**
|
|
* Write the capsule header (type + varint length + context ID) into `hdr`.
|
|
* @param hdr Output buffer (must be >= HTTP_CAPSULE_HEADER_MAX_SIZE)
|
|
* @param hdrlen Size of `hdr` in bytes
|
|
* @param payload_len Length of the UDP payload that follows
|
|
* @return Number of header bytes written, or 0 on error
|
|
*
|
|
* @unittest 3400
|
|
*/
|
|
UNITTEST size_t capsule_encap_udp_hdr(uint8_t *hdr, size_t hdrlen,
|
|
size_t payload_len);
|
|
UNITTEST size_t capsule_encap_udp_hdr(uint8_t *hdr, size_t hdrlen,
|
|
size_t payload_len)
|
|
{
|
|
size_t off = 0;
|
|
DEBUGASSERT(hdrlen >= HTTP_CAPSULE_HEADER_MAX_SIZE);
|
|
if(hdrlen < HTTP_CAPSULE_HEADER_MAX_SIZE)
|
|
return 0;
|
|
hdr[off++] = 0; /* capsule type: HTTP Datagram */
|
|
off += capsule_encode_varint_buf(hdr + off, (uint64_t)payload_len + 1);
|
|
hdr[off++] = 0; /* context ID */
|
|
return off;
|
|
}
|
|
|
|
CURLcode Curl_capsule_encap_udp_datagram(struct bufq *q,
|
|
const void *buf, size_t blen)
|
|
{
|
|
CURLcode result;
|
|
uint8_t hdr[HTTP_CAPSULE_HEADER_MAX_SIZE];
|
|
size_t hdr_len, nwritten;
|
|
|
|
hdr_len = capsule_encap_udp_hdr(hdr, sizeof(hdr), blen);
|
|
DEBUGASSERT(hdr_len);
|
|
if(!hdr_len)
|
|
return CURLE_FAILED_INIT;
|
|
|
|
result = Curl_bufq_write(q, hdr, hdr_len, &nwritten);
|
|
if(!result && (nwritten != hdr_len))
|
|
return CURLE_WRITE_ERROR;
|
|
if(!result) {
|
|
result = Curl_bufq_write(q, buf, blen, &nwritten);
|
|
if(!result && (nwritten != blen))
|
|
return CURLE_WRITE_ERROR;
|
|
}
|
|
if(result == CURLE_AGAIN)
|
|
return CURLE_WRITE_ERROR;
|
|
return result;
|
|
}
|
|
|
|
size_t Curl_capsule_process_udp_raw(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct bufq *recvbufq,
|
|
unsigned char *buf, size_t len,
|
|
CURLcode *err)
|
|
{
|
|
const unsigned char *context_id, *capsule_type;
|
|
size_t read_size, varint_len;
|
|
uint64_t capsule_length;
|
|
size_t offset, payload_len;
|
|
size_t bytes_read = 0;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
if(!len) {
|
|
*err = CURLE_BAD_FUNCTION_ARGUMENT;
|
|
return 0;
|
|
}
|
|
|
|
if(Curl_bufq_is_empty(recvbufq)) {
|
|
*err = CURLE_AGAIN;
|
|
return 0;
|
|
}
|
|
|
|
if(!Curl_bufq_peek(recvbufq, &capsule_type, &read_size) || !read_size) {
|
|
*err = CURLE_AGAIN;
|
|
return 0;
|
|
}
|
|
|
|
if(capsule_type[0]) {
|
|
infof(data, "Error! Invalid capsule type: %d", capsule_type[0]);
|
|
Curl_bufq_skip(recvbufq, 1);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
|
|
offset = 1;
|
|
result = capsule_decode_varint_at(recvbufq, offset, &capsule_length,
|
|
&varint_len);
|
|
if(result == CURLE_AGAIN) {
|
|
*err = CURLE_AGAIN;
|
|
return 0;
|
|
}
|
|
else if(result) {
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
offset += varint_len;
|
|
|
|
if(!Curl_bufq_peek_at(recvbufq, offset, &context_id, &read_size) ||
|
|
!read_size) {
|
|
*err = CURLE_AGAIN;
|
|
return 0;
|
|
}
|
|
|
|
if(*context_id) {
|
|
infof(data, "Error! Invalid context ID: %02x", *context_id);
|
|
Curl_bufq_skip(recvbufq, offset + 1);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
offset += 1;
|
|
|
|
if(!capsule_length) {
|
|
infof(data, "Error! Invalid capsule length: 0");
|
|
Curl_bufq_skip(recvbufq, offset);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
if(capsule_length - 1 >= (uint64_t)SIZE_MAX) {
|
|
infof(data, "Error! Capsule length too large: %" CURL_FORMAT_CURL_OFF_T,
|
|
(curl_off_t)capsule_length);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
payload_len = (size_t)(capsule_length - 1);
|
|
|
|
if(Curl_bufq_len(recvbufq) < offset + payload_len) {
|
|
*err = CURLE_AGAIN;
|
|
return 0;
|
|
}
|
|
|
|
if(payload_len > len) {
|
|
infof(data, "UDP payload does not fit destination buffer: %zu > %zu",
|
|
payload_len, len);
|
|
Curl_bufq_skip(recvbufq, offset + payload_len);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
|
|
Curl_bufq_skip(recvbufq, offset);
|
|
if(!payload_len) {
|
|
*err = CURLE_OK;
|
|
return 0;
|
|
}
|
|
result = Curl_bufq_read(recvbufq, buf, payload_len, &bytes_read);
|
|
if(result || (bytes_read != payload_len)) {
|
|
infof(data, "Error! Read less than expected %zu %zu",
|
|
payload_len, bytes_read);
|
|
*err = CURLE_RECV_ERROR;
|
|
return 0;
|
|
}
|
|
|
|
if(cf && data) {
|
|
CURL_TRC_CF(data, cf, "Processed UDP capsule raw: size=%zu "
|
|
"length_left %zu", payload_len, Curl_bufq_len(recvbufq));
|
|
}
|
|
*err = CURLE_OK;
|
|
return bytes_read;
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_PROXY && !CURL_DISABLE_HTTP */
|