mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
242 lines
6.5 KiB
C
Vendored
Generated
242 lines
6.5 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"
|
|
|
|
#ifndef CURL_DISABLE_PROXY
|
|
|
|
#include "urldata.h"
|
|
#include "cfilters.h"
|
|
#include "cf-haproxy.h"
|
|
#include "connect.h"
|
|
#include "curl_addrinfo.h"
|
|
#include "curl_trc.h"
|
|
#include "select.h"
|
|
|
|
|
|
typedef enum {
|
|
HAPROXY_INIT, /* init/default/no tunnel state */
|
|
HAPROXY_SEND, /* data_out being sent */
|
|
HAPROXY_DONE /* all work done */
|
|
} haproxy_state;
|
|
|
|
struct cf_haproxy_ctx {
|
|
int state;
|
|
struct dynbuf data_out;
|
|
};
|
|
|
|
static void cf_haproxy_ctx_free(struct cf_haproxy_ctx *ctx)
|
|
{
|
|
if(ctx) {
|
|
curlx_dyn_free(&ctx->data_out);
|
|
curlx_free(ctx);
|
|
}
|
|
}
|
|
|
|
static CURLcode cf_haproxy_date_out_set(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
/* We fake a client connection report to the upstream server
|
|
* with the HAProxy protocol, reporting the client's source
|
|
* and destination IP addresses and ports.
|
|
* addresses: either the ones used to talk to the upstream
|
|
* OR the value supplied by the user
|
|
* ports: the ports used in the upstream connection */
|
|
const char *client_source_ip;
|
|
const char *client_dest_ip;
|
|
struct cf_haproxy_ctx *ctx = cf->ctx;
|
|
CURLcode result;
|
|
struct ip_quadruple ipquad;
|
|
bool is_ipv6;
|
|
|
|
DEBUGASSERT(ctx);
|
|
DEBUGASSERT(ctx->state == HAPROXY_INIT);
|
|
#ifdef USE_UNIX_SOCKETS
|
|
if(Curl_conn_get_first_peer(cf->conn, cf->sockindex)->unix_socket)
|
|
/* the buffer is large enough to hold this! */
|
|
result = curlx_dyn_addn(&ctx->data_out, STRCONST("PROXY UNKNOWN\r\n"));
|
|
else {
|
|
#endif /* USE_UNIX_SOCKETS */
|
|
result = Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad);
|
|
if(result)
|
|
return result;
|
|
|
|
if(data->set.str[STRING_HAPROXY_CLIENT_IP]) {
|
|
client_source_ip = data->set.str[STRING_HAPROXY_CLIENT_IP];
|
|
client_dest_ip = client_source_ip;
|
|
is_ipv6 = !Curl_is_ipv4addr(client_source_ip);
|
|
}
|
|
else {
|
|
client_source_ip = ipquad.local_ip;
|
|
client_dest_ip = ipquad.remote_ip;
|
|
}
|
|
|
|
result = curlx_dyn_addf(&ctx->data_out, "PROXY %s %s %s %d %d\r\n",
|
|
is_ipv6 ? "TCP6" : "TCP4",
|
|
client_source_ip, client_dest_ip,
|
|
ipquad.local_port, ipquad.remote_port);
|
|
|
|
#ifdef USE_UNIX_SOCKETS
|
|
}
|
|
#endif /* USE_UNIX_SOCKETS */
|
|
return result;
|
|
}
|
|
|
|
static CURLcode cf_haproxy_connect(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
bool *done)
|
|
{
|
|
struct cf_haproxy_ctx *ctx = cf->ctx;
|
|
CURLcode result;
|
|
size_t len;
|
|
|
|
DEBUGASSERT(ctx);
|
|
if(cf->connected) {
|
|
*done = TRUE;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
result = cf->next->cft->do_connect(cf->next, data, done);
|
|
if(result || !*done)
|
|
return result;
|
|
|
|
switch(ctx->state) {
|
|
case HAPROXY_INIT:
|
|
result = cf_haproxy_date_out_set(cf, data);
|
|
if(result)
|
|
goto out;
|
|
ctx->state = HAPROXY_SEND;
|
|
FALLTHROUGH();
|
|
case HAPROXY_SEND:
|
|
len = curlx_dyn_len(&ctx->data_out);
|
|
if(len > 0) {
|
|
size_t nwritten;
|
|
result = Curl_conn_cf_send(cf->next, data,
|
|
curlx_dyn_uptr(&ctx->data_out), len, FALSE,
|
|
&nwritten);
|
|
if(result) {
|
|
if(result != CURLE_AGAIN)
|
|
goto out;
|
|
result = CURLE_OK;
|
|
nwritten = 0;
|
|
}
|
|
curlx_dyn_tail(&ctx->data_out, len - nwritten);
|
|
if(curlx_dyn_len(&ctx->data_out) > 0) {
|
|
result = CURLE_OK;
|
|
goto out;
|
|
}
|
|
}
|
|
ctx->state = HAPROXY_DONE;
|
|
FALLTHROUGH();
|
|
default:
|
|
curlx_dyn_free(&ctx->data_out);
|
|
break;
|
|
}
|
|
|
|
out:
|
|
*done = (!result) && (ctx->state == HAPROXY_DONE);
|
|
cf->connected = *done;
|
|
return result;
|
|
}
|
|
|
|
static void cf_haproxy_destroy(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
CURL_TRC_CF(data, cf, "destroy");
|
|
cf_haproxy_ctx_free(cf->ctx);
|
|
}
|
|
|
|
static CURLcode cf_haproxy_adjust_pollset(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct easy_pollset *ps)
|
|
{
|
|
if(cf->next->connected && !cf->connected) {
|
|
/* If we are not connected, but the filter "below" is
|
|
* and not waiting on something, we are sending. */
|
|
return Curl_pollset_set_out_only(
|
|
data, ps, Curl_conn_cf_get_socket(cf, data));
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
struct Curl_cftype Curl_cft_haproxy = {
|
|
"HAPROXY",
|
|
CF_TYPE_PROXY | CF_TYPE_SETUP,
|
|
0,
|
|
cf_haproxy_destroy,
|
|
cf_haproxy_connect,
|
|
Curl_cf_def_shutdown,
|
|
cf_haproxy_adjust_pollset,
|
|
Curl_cf_def_data_pending,
|
|
Curl_cf_def_send,
|
|
Curl_cf_def_recv,
|
|
Curl_cf_def_cntrl,
|
|
Curl_cf_def_conn_is_alive,
|
|
Curl_cf_def_conn_keep_alive,
|
|
Curl_cf_def_query,
|
|
};
|
|
|
|
static CURLcode cf_haproxy_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct Curl_cfilter *cf = NULL;
|
|
struct cf_haproxy_ctx *ctx;
|
|
CURLcode result;
|
|
|
|
(void)data;
|
|
ctx = curlx_calloc(1, sizeof(*ctx));
|
|
if(!ctx) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
ctx->state = HAPROXY_INIT;
|
|
curlx_dyn_init(&ctx->data_out, DYN_HAXPROXY);
|
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_haproxy, ctx);
|
|
if(result)
|
|
goto out;
|
|
ctx = NULL;
|
|
|
|
out:
|
|
cf_haproxy_ctx_free(ctx);
|
|
*pcf = result ? NULL : cf;
|
|
return result;
|
|
}
|
|
|
|
CURLcode Curl_cf_haproxy_insert_after(struct Curl_cfilter *cf_at,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct Curl_cfilter *cf;
|
|
CURLcode result;
|
|
|
|
result = cf_haproxy_create(&cf, data);
|
|
if(result)
|
|
goto out;
|
|
Curl_conn_cf_insert_after(cf_at, cf);
|
|
|
|
out:
|
|
return result;
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_PROXY */
|