Skip to content

Move picoquic to 36f49b73 - #69

Merged
rwl4 merged 1 commit into
openmoq:mainfrom
zshenker:picoquic-bump-36f49b7
Nov 17, 2026
Merged

rwl4 merged 1 commit into
openmoq:mainfrom
zshenker:picoquic-bump-36f49b7

Conversation

@zshenker

@zshenker zshenker commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Moves the picoquic pin from 70b5fd5 to 36f49b73, release v2026.11.12.36f49b7. This is upstream master at the time of writing and is 162 commits ahead. It includes #2369, the ACK_FREQUENCY min_ack_delay floor, so this supersedes #68. If #68 merges first, this PR drops its 0012 and series entry.

Rebasing the series

0001, 0002, 0005, 0007, 0008, 0009 and 0010 applied unchanged in substance. The others needed real changes:

  • 0003
    • Uses upstream's cached first_stream_data (83cd9728). The direct-receive guard and the undelivered-node lookup now start from the cached node.
    • Upstream removed stream->cnx (9fb927c8) and moved output-stream unlinking into picoquic_stream_node_delete. The queued close-check dequeue moved there as well.
    • Upstream 6152f9e6 replaces a NULL callback with one that refuses every event. A connection without a callback therefore no longer queues in-order data. The direct-receive tests, 0003's stream_direct_receive_handover and the direct_receive_close_check scenarios that 0003 and 0010 share, now queue data and FIN behind a missing first byte. That byte is injected directly so no retransmission follows, and the app needs the stream only from that byte on. Every assertion is unchanged.
    • Removing the close-check queue call makes every reworked scenario fail, so the tests still catch that regression.
  • 0004: upstream moved tuple promotion into picoquic_promote_tuple_to_default and added a NAT-rebinding caller. The reset-secret re-registration now happens inside that helper, so both paths keep the "refreshed whenever the default path's first tuple changes" contract.
  • 0006: picohttp_callback_stream_send_committed comes after upstream's new picohttp_callback_app_wakeup.
  • 0011: the test snapshot follows upstream's single ptls_cipher_suite_t* table, after the fusion removal. The lock itself is unchanged, and upstream's new algorithm-selection code only reads the tables.

The preambles and patches/picoquic/README.md are updated. The README adds a Superseded entry for #2369 and one for the NULL-callback change.

LibMoQ changes

  • Upstream renamed initial_max_stream_id_{uni,bi}dir to initial_max_streams_{uni,bidi} (157543f1). The pico_wt and picoquic adapters, their tests and their header comments are updated. No moq5 API changes.
  • pq_zero_rtt_refused: the raw client used a NULL default callback, which is now refused during the handshake. It now passes a callback that accepts every event.
  • The pin is also updated in publish-interop-client.yml, adapters/picoquic/README.md and a FindPicoquic.cmake comment.

Behavior note: pq_release_cnx, moq_pq_conn_destroy and the pico_wt teardown paths detach a live connection with picoquic_set_callback(cnx, NULL, NULL). With this picoquic, any later event on that connection gets the refusing callback. Stream data, for example, now closes the connection with INTERNAL_ERROR instead of staying queued. The moq5 tests pass, but the change affects a caller-owned client connection that outlives its adapter.

Testing

  • scripts/setup_picoquic_deps.sh fetches 36f49b73 and applies 0001–0011. The resulting tree is identical, as a git tree hash, to the rebased series it was generated from.
  • picoquic picoquic_ct: 766 of 766 pass.
  • moq5 ctest: 513 of 523 pass, the same result as main on this machine. The provider-patch series self-tests pass. The 10 failures are local environment issues and unrelated to this change:
    • 8 cmake_manual_exports_* tests and the multi-config step of picoquic_setup_recipe need Ninja, which is not installed here.
    • consumer_warning_diagnostics hits an unrelated CMake argument error.

🤖 Generated with Claude Code


This change is Reviewable

Pin picoquic to 36f49b73 (release v2026.11.12.36f49b7), which includes
upstream PR2369 (ACK_FREQUENCY max ack delay floor at the peer's
min_ack_delay), and rebase the picoquic series onto it.

Rebase changes:
- 0003 uses upstream's cached first stream segment, and unlinks a queued
  close check in picoquic_stream_node_delete, where upstream now has the
  connection. Its direct-receive tests, and 0010's, queue data behind a
  missing first byte, since upstream no longer queues in-order data for a
  connection without a callback.
- 0004 re-registers the reset secret in upstream's new
  picoquic_promote_tuple_to_default, which also covers NAT rebinding.
- 0006 appends picohttp_callback_stream_send_committed after upstream's
  new picohttp_callback_app_wakeup.
- 0011's test follows upstream's single cipher-suite table.

LibMoQ follows upstream's rename of initial_max_stream_id_{uni,bi}dir to
initial_max_streams_{uni,bidi}, and pq_zero_rtt_refused's raw client gets
a callback that accepts every event.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@rwl4
rwl4 merged commit a2f3f22 into openmoq:main Nov 17, 2026
30 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants