Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/publish-interop-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ on:
workflow_dispatch:
inputs:
picoquic_ref:
description: 'picoquic branch/tag/full SHA override (default: 70b5fd5aafdd2d6c349ff783202ece9d778bcaf2)'
description: 'picoquic branch/tag/full SHA override (default: 36f49b73d532369882d97474ac018655b6739a58)'
required: false
default: '70b5fd5aafdd2d6c349ff783202ece9d778bcaf2'
default: '36f49b73d532369882d97474ac018655b6739a58'
picotls_ref:
description: 'picotls branch/tag/full SHA override (default: 7f0d38c1c54c920d56b4e13ceb1c2dfa2b1325e1)'
required: false
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Validate picoquic + picotls refs
shell: bash
env:
PICOQUIC_REF: ${{ github.event.inputs.picoquic_ref || '70b5fd5aafdd2d6c349ff783202ece9d778bcaf2' }}
PICOQUIC_REF: ${{ github.event.inputs.picoquic_ref || '36f49b73d532369882d97474ac018655b6739a58' }}
PICOTLS_REF: ${{ github.event.inputs.picotls_ref || '7f0d38c1c54c920d56b4e13ceb1c2dfa2b1325e1' }}
run: |
set -euo pipefail
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Fetch picoquic + picotls (recurse submodules)
shell: bash
env:
PICOQUIC_REF: ${{ github.event.inputs.picoquic_ref || '70b5fd5aafdd2d6c349ff783202ece9d778bcaf2' }}
PICOQUIC_REF: ${{ github.event.inputs.picoquic_ref || '36f49b73d532369882d97474ac018655b6739a58' }}
PICOTLS_REF: ${{ github.event.inputs.picotls_ref || '7f0d38c1c54c920d56b4e13ceb1c2dfa2b1325e1' }}
run: |
set -euo pipefail
Expand Down
6 changes: 3 additions & 3 deletions adapters/pico_wt/include/moq/pico_wt.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ MOQ_API void moq_pico_wt_conn_notify_transport_closed(
* most that window. A tighter maximum follows from the caller's own
* configuration, per category: peer unidirectional WT streams are bounded by
* initial_max_stream_data_uni times the number of such streams picoquic lets
* the peer keep open at once (initial_max_stream_id_unidir governs
* the peer keep open at once (initial_max_streams_uni governs
* concurrency, not lifetime: picoquic re-credits a stream as each completes);
* peer-initiated bidirectional streams by initial_max_stream_data_bidi_remote
* and initial_max_stream_id_bidir; locally initiated bidirectional streams
* and initial_max_streams_bidi; locally initiated bidirectional streams
* (request streams, whose receive half this adapter also tracks) by
* initial_max_stream_data_bidi_local times however many such streams the
* PEER's MAX_STREAMS allows this endpoint to open, which is not under this
Expand Down Expand Up @@ -218,7 +218,7 @@ MOQ_API void moq_pico_wt_conn_notify_transport_closed(
* stream limits while the streams it already counted stay counted, under
* this adapter's receive accounting. Create refuses a connection whose
* local transport parameters cannot be read, before taking anything. The
* adapter samples initial_max_stream_id_unidir at attach and fails the
* adapter samples initial_max_streams_uni at attach and fails the
* connection closed (the adapter's inbound failure) when a receive sweep
* finds it changed or unreadable. That check sees only a change of that one
* value; it does not see other parameters or the stream-credit history
Expand Down
4 changes: 2 additions & 2 deletions adapters/pico_wt/pico_wt_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ int moq_pico_wt_conn_create(const moq_pico_wt_conn_cfg_t *cfg,
c->stop_sending_count = 0;
c->last_stop_sending_stream_id = UINT64_MAX;

c->tp_max_streams_uni = tp->initial_max_stream_id_unidir;
c->tp_max_streams_uni = tp->initial_max_streams_uni;

/* Initialize endpoint ops. */
if (pico_wt_endpoint_init(&c->endpoint_ops, &c->endpoint_ctx,
Expand Down Expand Up @@ -910,7 +910,7 @@ static void pw_rx_sweep(moq_pico_wt_conn_t *c, uint64_t now)
if (c->cnx) {
const picoquic_tp_t *tp = picoquic_get_transport_parameters(c->cnx, 1);
if (tp == NULL ||
tp->initial_max_stream_id_unidir != c->tp_max_streams_uni) {
tp->initial_max_streams_uni != c->tp_max_streams_uni) {
moq_transport_bridge_on_transport_error(
c->bridge, PICO_WT_INBOUND_FATAL_CODE, now);
return;
Expand Down
2 changes: 1 addition & 1 deletion adapters/pico_wt/pico_wt_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ struct moq_pico_wt_conn {
bool rx_replay_complete;
uint64_t rx_replay_complete_sid;

/* The peer-unidirectional stream credit (initial_max_stream_id_unidir)
/* The peer-unidirectional stream credit (initial_max_streams_uni)
* this endpoint's transport parameters carried when the adapter attached,
* after picowt's own adjustment (picowt_set_transport_parameters raises
* it to at least 63). A later picoquic_set_transport_parameters on the
Expand Down
2 changes: 1 addition & 1 deletion adapters/pico_wt/tests/test_outbound_stream_credit.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static int setup(credit_pair_t *p, uint8_t discriminator)
* completable DATA to trigger replenishment without closing control.
* Three WT bidis cover CONNECT and two held MoQ requests. */
picoquic_tp_t tp = *picoquic_get_transport_parameters(h->test_ctx->cnx_client, 1);
tp.initial_max_stream_id_unidir = p->wt ? 9 : 3;
tp.initial_max_streams_uni = p->wt ? 9 : 3;
tp.is_reset_stream_at_enabled = 1;
picoquic_set_transport_parameters(h->test_ctx->cnx_client, &tp);
picoquic_set_default_tp_value(h->test_ctx->qserver,
Expand Down
6 changes: 3 additions & 3 deletions adapters/pico_wt/tests/test_pico_wt_hold_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static uint64_t g_next_bidi = 4; /* client-initiated bidi after the WT CONNEC
static uint64_t g_reset_code = 0;
static uint64_t g_peer_stop_code = 0;
static uint64_t g_rx_window = 65535;
static uint64_t g_tp_streams_uni = 64; /* initial_max_stream_id_unidir */
static uint64_t g_tp_streams_uni = 64; /* initial_max_streams_uni */
static uint64_t g_tp_streams_bidi = 0;
static uint32_t g_client_max_events = 64; /* the fetcher session's event queue */
static picoquic_state_enum g_cnx_state = picoquic_state_ready;
Expand Down Expand Up @@ -97,8 +97,8 @@ picoquic_tp_t const *picoquic_get_transport_parameters(picoquic_cnx_t *c, int ge
tp.initial_max_stream_data_uni = g_rx_window;
tp.initial_max_stream_data_bidi_remote = g_rx_window;
tp.initial_max_stream_data_bidi_local = g_rx_window;
tp.initial_max_stream_id_unidir = g_tp_streams_uni;
tp.initial_max_stream_id_bidir = g_tp_streams_bidi;
tp.initial_max_streams_uni = g_tp_streams_uni;
tp.initial_max_streams_bidi = g_tp_streams_bidi;
tp.is_reset_stream_at_enabled = g_reset_at_enabled;
return &tp; }

Expand Down
2 changes: 1 addition & 1 deletion adapters/picoquic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ and `Threads::Threads`.
## Provider source baseline

The pinned development picoquic source is
70b5fd5aafdd2d6c349ff783202ece9d778bcaf2 (release `v2026.10.22.70b5fd5`)
36f49b73d532369882d97474ac018655b6739a58 (release `v2026.11.12.36f49b7`)
with the patches `scripts/setup_picoquic_deps.sh` applies, built against
picotls 7f0d38c1c54c920d56b4e13ceb1c2dfa2b1325e1. Other source trees given
through `MOQ_PICOQUIC_SOURCE_DIR` are used as they are: no version is
Expand Down
6 changes: 3 additions & 3 deletions adapters/picoquic/include/moq/picoquic.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
* follows from the caller's own configuration, per category: peer
* unidirectional streams are bounded by the window this endpoint advertised
* for them (initial_max_stream_data_uni) times the number of such streams
* picoquic lets the peer keep open at once (initial_max_stream_id_unidir
* picoquic lets the peer keep open at once (initial_max_streams_uni
* governs concurrency, not lifetime: picoquic re-credits a stream as each
* one completes); peer-initiated bidirectional streams likewise by
* initial_max_stream_data_bidi_remote and initial_max_stream_id_bidir;
* initial_max_stream_data_bidi_remote and initial_max_streams_bidi;
* locally initiated bidirectional streams (request streams, whose receive
* half this adapter also tracks) by initial_max_stream_data_bidi_local times
* however many such streams the PEER's MAX_STREAMS allows this endpoint to
Expand All @@ -83,7 +83,7 @@
* stream limits while the streams it already counted stay counted, under
* this adapter's receive accounting. Create refuses a connection whose
* local transport parameters cannot be read, before taking anything. The
* adapter samples initial_max_stream_id_unidir at attach and fails the
* adapter samples initial_max_streams_uni at attach and fails the
* connection closed (the transport-error path) when a service pass finds it
* changed or unreadable. That check sees only a change of that one value;
* it does not see other parameters or the stream-credit history before
Expand Down
6 changes: 3 additions & 3 deletions adapters/picoquic/moq_picoquic.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct moq_pq_conn {
size_t rx_count;
size_t rx_cap;

/* The peer-unidirectional stream credit (initial_max_stream_id_unidir)
/* The peer-unidirectional stream credit (initial_max_streams_uni)
* this endpoint's transport parameters carried when the adapter attached.
* Attach comes after the caller's transport-parameter preparation; a
* later picoquic_set_transport_parameters on the connection is outside
Expand Down Expand Up @@ -664,7 +664,7 @@ static void pq_rx_after_service(moq_pq_conn_t *c, uint64_t now)
if (c->cnx) {
const picoquic_tp_t *tp = picoquic_get_transport_parameters(c->cnx, 1);
if (tp == NULL ||
tp->initial_max_stream_id_unidir != c->tp_max_streams_uni) {
tp->initial_max_streams_uni != c->tp_max_streams_uni) {
moq_transport_bridge_on_transport_error(c->bridge, 0, now);
return;
}
Expand Down Expand Up @@ -952,7 +952,7 @@ int moq_pq_conn_create(const moq_pq_conn_cfg_t *cfg,
sizeof(cfg->after_callback))
c->after_callback = cfg->after_callback;

c->tp_max_streams_uni = tp->initial_max_stream_id_unidir;
c->tp_max_streams_uni = tp->initial_max_streams_uni;
uint64_t queue_cap = MOQ_PQ_SEND_QUEUE_CAP_DEFAULT;
if (cfg->struct_size >= offsetof(moq_pq_conn_cfg_t, send_queue_cap_bytes) +
sizeof(cfg->send_queue_cap_bytes) && cfg->send_queue_cap_bytes)
Expand Down
6 changes: 3 additions & 3 deletions adapters/picoquic/tests/test_pq_hold_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static uint64_t g_next_bidi = 0; /* client-initiated bidi: 0, 4, 8 .. */
static uint64_t g_reset_code = 0; /* code the next stream_reset event carries */
static uint64_t g_peer_stop_code = 0;
static uint64_t g_rx_window = 65535;
static uint64_t g_tp_streams_uni = 64; /* initial_max_stream_id_unidir */
static uint64_t g_tp_streams_uni = 64; /* initial_max_streams_uni */
static uint64_t g_tp_streams_bidi = 0;
static uint32_t g_client_max_events = 64; /* the fetcher session's event queue */
static picoquic_state_enum g_cnx_state = picoquic_state_ready;
Expand Down Expand Up @@ -196,8 +196,8 @@ picoquic_tp_t const *picoquic_get_transport_parameters(picoquic_cnx_t *c, int ge
tp.initial_max_stream_data_uni = g_rx_window;
tp.initial_max_stream_data_bidi_remote = g_rx_window;
tp.initial_max_stream_data_bidi_local = g_rx_window;
tp.initial_max_stream_id_unidir = g_tp_streams_uni;
tp.initial_max_stream_id_bidir = g_tp_streams_bidi;
tp.initial_max_streams_uni = g_tp_streams_uni;
tp.initial_max_streams_bidi = g_tp_streams_bidi;
return &tp; }

/* Flow-control instrumentation: app-flow-control takeover and grants per stream. */
Expand Down
2 changes: 1 addition & 1 deletion adapters/picoquic/tests/test_pq_provider_stream_credit.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static int setup(pair_t *p)
REQUIRE(tls_api_one_sim_round(p->tls, &p->now, limit, &active) == 0);
}
REQUIRE(picoquic_get_cnx_state(s) == picoquic_state_ready);
REQUIRE(s->local_parameters.initial_max_stream_id_unidir == 1);
REQUIRE(s->local_parameters.initial_max_streams_uni == 1);
REQUIRE(s->max_streams_unidir_local == 1);
REQUIRE(s->max_streams_unidir_local_computed == 0);
REQUIRE(s->is_reset_stream_at_enabled);
Expand Down
14 changes: 13 additions & 1 deletion adapters/picoquic/tests/test_pq_zero_rtt_refused.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ static int noop_pump(moq_pq_threaded_t *t, moq_pq_threaded_lane_t *lane,
return 0;
}

/* The raw client accepts every event. picoquic replaces a NULL callback with
* one that refuses every event, which would fail the handshake. */
static int accept_all_cb(picoquic_cnx_t *cnx, uint64_t stream_id,
uint8_t *bytes, size_t length,
picoquic_call_back_event_t event, void *ctx,
void *stream_ctx)
{
(void)cnx; (void)stream_id; (void)bytes; (void)length; (void)event;
(void)ctx; (void)stream_ctx;
return 0;
}

/* Drive one client connection to readiness, then keep pumping a short while so a
* post-handshake NEW_SESSION_TICKET is received. Returns 0 when ready. */
static int drive(picoquic_quic_t *quic, picoquic_cnx_t *cnx, int fd,
Expand Down Expand Up @@ -138,7 +150,7 @@ int main(void)
snprintf(ticket_file, sizeof(ticket_file), "moq_0rtt_tickets_%d.bin",
(int)getpid());
(void)unlink(ticket_file);
picoquic_quic_t *cq = picoquic_create(2, NULL, NULL, NULL, NULL, NULL, NULL,
picoquic_quic_t *cq = picoquic_create(2, NULL, NULL, NULL, NULL, accept_all_cb, NULL,
NULL, NULL, NULL, now, NULL,
ticket_file, NULL, 0);
CHECK(cq != NULL);
Expand Down
2 changes: 1 addition & 1 deletion adapters/picoquic/tests/test_threaded_quiet_receive.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static void test_quiet_held_deadline(void)
const picoquic_tp_t *current_tp = picoquic_get_transport_parameters(cnx, 1);
HOLD_REQUIRE(current_tp != NULL);
picoquic_tp_t tp = *current_tp;
tp.initial_max_stream_id_unidir = BRIDGE_DEFAULT_MAX_STREAMS;
tp.initial_max_streams_uni = BRIDGE_DEFAULT_MAX_STREAMS;
tp.initial_max_stream_data_uni = 1024;
picoquic_set_transport_parameters(cnx, &tp);

Expand Down
2 changes: 1 addition & 1 deletion adapters/picoquic/tests/test_threaded_terminal_controls.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ static int cli_fatal_pump(moq_pq_threaded_t *t, moq_pq_threaded_lane_t *lane,
if (!cnx)
return 0;
picoquic_tp_t tp = *picoquic_get_transport_parameters(cnx, 1);
tp.initial_max_stream_id_unidir += 1;
tp.initial_max_streams_uni += 1;
picoquic_set_transport_parameters(cnx, &tp);
__atomic_store_n(&cf->tampered, 1, __ATOMIC_RELEASE);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindPicoquic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ if(MOQ_PICOQUIC_SOURCE_DIR)
# The provider's own edges are used as declared: picoquic-log links
# picoquic-core, picoquic-test links picoquic-log, and picoquic-core
# needs nothing from picoquic-log. That holds for the pinned source
# baseline (picoquic 70b5fd5), whose core no longer calls the log
# baseline (picoquic 36f49b7), whose core no longer calls the log
# library. Automatic accommodation of the older core/log cycle (e.g.
# 55b473e2, whose core calls picoquic_set_qlog) is retired, and there
# is no configure-time capability check. Consumers of such a source
Expand Down
8 changes: 4 additions & 4 deletions patches/picoquic/0001-use-declared-project-version.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Keep the declared project version in source archives and subproject builds.

Applies to picoquic 70b5fd5aafdd2d6c349ff783202ece9d778bcaf2.
Applies to picoquic 36f49b73d532369882d97474ac018655b6739a58.

The parent may not be a Git checkout, and its revision is not picoquic's. The
package configuration and version files use project()'s version, and
Expand All @@ -9,10 +9,10 @@ Tests: tests/cmake/PicoquicVersionMetadata.cmake (CTest
picoquic_version_metadata), in archive and subproject modes.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7d2c346..b92d95fe 100644
index 23ef4492..8de91bfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -863,14 +863,9 @@ install(FILES
@@ -876,14 +876,9 @@ install(FILES

include(CMakePackageConfigHelpers)

Expand All @@ -30,7 +30,7 @@ index a7d2c346..b92d95fe 100644
message(STATUS "Project version: ${PROJECT_VERSION}")

if (NOT CMAKE_INSTALL_LIBDIR)
@@ -881,7 +876,7 @@ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of head
@@ -894,7 +889,7 @@ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of head

set(INSTALL_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})

Expand Down
4 changes: 2 additions & 2 deletions patches/picoquic/0002-deduplicate-link-libraries.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
De-duplicate libraries on link lines where the linker does not need repeats.

Applies to picoquic 70b5fd5aafdd2d6c349ff783202ece9d778bcaf2, after 0001.
Applies to picoquic 36f49b73d532369882d97474ac018655b6739a58, after 0001.

picoquic's targets list the same static archives more than once, and Apple's
linker warns about each repeat. CMake 3.29 and later (policy CMP0156, set NEW when available) drop repeats
Expand All @@ -9,7 +9,7 @@ Tests: adapters/picoquic's source-mode link policy check
(picoquic_source_mode_link_policy).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7d2c346..37456ec2 100644
index 8de91bfd..4971158f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,10 @@
Expand Down
Loading
Loading