quic 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebac23fb2ffb37336b61ef65171597216d95ec7a0a43ecb3aabfda810fbb5046
-  data.tar.gz: c78df53ff6e4e56f11a7aa3ae93bb1363090d58acf4e3f5b5b2290208b88fee9
+  metadata.gz: fd02d782aebbc1128a0fca8bda34bc2651b5d677e682d126ab0575b332b4f556
+  data.tar.gz: 9a5155a1b4f75a342d7476895641e5b2e06a6f7d5e99b4bd6f1830c90e747cda
 SHA512:
-  metadata.gz: 34f56bd2d3d86c35bdcbe43e912f3b8ebd30454915332523b97a95a9306cb9febf0a7933f904f5fa3afc40b66014796523f59a6e5c0f47465b4c628db681b7f9
-  data.tar.gz: d00248c71fc9436bec13a5f258038512726c65427fe76315347ba40db071174d1c1b47dbfac02e1d7d46fb4c2e161e190cbaf9cbcf0c947a139ee5162cf2334d
+  metadata.gz: f94809c98904f20281edbc702f57db0c0014e53243fb2d478e02c1c54870fb205bad185aadf3ab319d4f2294484aca46cf58b72f4d5a486138584426cd513808
+  data.tar.gz: d1f7925f594bc307201a295aed815084000da0e0c2a057dc6ad403d587888b42ae4a478a5d4949603a5d5d70f3c51b9cc2fa1224d1783956c9b2330743e2e467

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.6] - 2026-11-03
+
+### Added
+- `quic/ext.h` is ABI 1.1: a stream handler's new `recv_stop_sending` is called as soon as the peer's STOP_SENDING arrives, instead of the handler learning of it when the stream closes. Handlers built for ABI 1.0 keep working. ([#23](https://github.com/unasuke/quic-ruby/pull/23))
+
+### Changed
+- ngtcp2 is now built from 1.26.0 (was 1.25.0), and picotls from `a2d95de`, the revision ngtcp2 1.26.0 is tested against. ([#24](https://github.com/unasuke/quic-ruby/pull/24))
+
 ## [0.0.5] - 2026-10-24
 
 ### Fixed

data/LICENSE-DEPENDENCIES.txt

@@ -9,7 +9,7 @@ bundled nor redistributed. The quic gem itself is MIT licensed; see
 LICENSE.txt.
 
 
-ngtcp2 1.25.0 -- https://github.com/ngtcp2/ngtcp2
+ngtcp2 1.26.0 -- https://github.com/ngtcp2/ngtcp2
 -------------------------------------------------
 
 The MIT License
@@ -53,7 +53,7 @@ the statically linked libngtcp2 and are covered by their own terms:
     COPYING text above.
 
 
-picotls f07f1c8 -- https://github.com/h2o/picotls
+picotls a2d95de -- https://github.com/h2o/picotls
 -------------------------------------------------
 
 picotls has no top-level license file; the terms are stated in the header of

data/README.md

@@ -147,7 +147,7 @@ It applies to clients, `Connection::Server.accept` and every connection of an En
 
 ### From other native extensions
 
-Another native extension can drive a connection's streams from C instead of through `QUIC::Stream`, as the [http3](https://github.com/unasuke/http3-ruby) gem does. `quic/ext.h` declares the function table (ABI 1.0), and `QUIC::EXT_INCLUDE_DIR` tells an `extconf.rb` where it is:
+Another native extension can drive a connection's streams from C instead of through `QUIC::Stream`, as the [http3](https://github.com/unasuke/http3-ruby) gem does. `quic/ext.h` declares the function table (ABI 1.1; a stream handler built against ABI 1.0 keeps working), and `QUIC::EXT_INCLUDE_DIR` tells an `extconf.rb` where it is:
 
 ```ruby
 require "mkmf"

data/ext/quic/connection_common.c

@@ -653,16 +653,24 @@ static VALUE quic_recv_stop_sending_body(VALUE arg) {
 }
 
 /* The peer sent STOP_SENDING. ngtcp2 shuts the send side and sends
-   RESET_STREAM itself once this returns. A stream handler learns of it when
-   #write_pkt finds the send side shut (stream_shut_write). */
+   RESET_STREAM itself once this returns. A stream handler hears of it here
+   (recv_stop_sending). One built against ABI 1.0 lacks that member, and
+   learns of it only when #write_pkt finds the send side shut
+   (stream_shut_write) or the stream closes. */
 static int quic_recv_stop_sending_cb(ngtcp2_conn *conn, int64_t stream_id,
                                      uint64_t app_error_code, void *user_data,
                                      void *stream_user_data) {
   (void)conn;
   (void)stream_user_data;
   quic_conn_t *c = (quic_conn_t *)user_data;
-  if (c->handler)
-    return 0;
+  if (c->handler) {
+    if (!QUIC_EXT_HANDLER_HAS(c->handler, recv_stop_sending))
+      return 0;
+    return c->handler->recv_stop_sending(c->handler_ud, stream_id,
+                                         app_error_code) < 0
+               ? NGTCP2_ERR_CALLBACK_FAILURE
+               : 0;
+  }
   struct quic_stream_cb_args a = {
       .c = c, .stream_id = stream_id, .app_error_code = app_error_code};
   return quic_conn_protect(c, quic_recv_stop_sending_body, &a);

data/ext/quic/connection_common.h

@@ -14,6 +14,14 @@
    minimum destlen ngtcp2 accepts. Revisit when PMTUD is enabled (Phase 4+). */
 #define QUIC_WRITE_PKT_BUFLEN NGTCP2_MAX_UDP_PAYLOAD_SIZE
 
+/* Whether the stream handler h has member, judged by the size it was built
+   with: a handler built against an older quic/ext.h is shorter, and its
+   memory ends before the members added since. Compared with the end of the
+   member, not the start of the next one, so trailing padding does not
+   count. */
+#define QUIC_EXT_HANDLER_HAS(h, member)                                        \
+  ((h)->size >= offsetof(quic_ext_stream_handler, member) + sizeof((h)->member))
+
 /* A QUIC::Endpoint (endpoint.c). */
 typedef struct quic_endpoint quic_endpoint_t;
 

data/ext/quic/ext_api.c

@@ -15,14 +15,16 @@ static quic_ext_conn *quic_ext_conn_get(VALUE conn) {
 
 /* Hand every stream of the connection to h. Allowed once, and only before
    the connection has a QUIC::Stream: the two modes cannot share streams.
-   Every member of the ABI 1.0 handler is called, so h must be at least that
-   large. @stream_handler marks the connection for the Ruby side, which then
-   refuses #accept_stream. */
+   Every member of the ABI 1.0 handler is called, so h must hold them all
+   (handshake_completed is the last). A handler built against an older
+   quic/ext.h than this one is shorter than sizeof(quic_ext_stream_handler),
+   and is called only for the members its size covers. @stream_handler marks
+   the connection for the Ruby side, which then refuses #accept_stream. */
 static int quic_ext_set_stream_handler(quic_ext_conn *ec,
                                        const quic_ext_stream_handler *h,
                                        void *ud, VALUE owner) {
   quic_conn_t *c = quic_ext_conn_struct(ec);
-  if (h == NULL || h->size < sizeof(quic_ext_stream_handler))
+  if (h == NULL || !QUIC_EXT_HANDLER_HAS(h, handshake_completed))
     return QUIC_EXT_ERR_OTHER;
   if (c->handler != NULL)
     return QUIC_EXT_ERR_INVALID_STATE;
@@ -93,7 +95,7 @@ static int quic_ext_set_application_error(quic_ext_conn *ec,
 
 const quic_ext_api quic_ext_api_table = {
     .abi_major = QUIC_EXT_ABI_MAJOR,
-    .abi_minor = 0,
+    .abi_minor = QUIC_EXT_ABI_MINOR,
     .size = sizeof(quic_ext_api),
     .conn_get = quic_ext_conn_get,
     .set_stream_handler = quic_ext_set_stream_handler,

data/ext/quic/extconf.rb

@@ -5,11 +5,11 @@ require "mini_portile2"
 require "shellwords"
 require "fileutils"
 
-NGTCP2_VERSION = "1.25.0"
-NGTCP2_SHA256 = "1c0843076528a87b65e9a9d455100941f4cb65d44f96c5da6ae56df146043955"
-# The picotls revision that ngtcp2 1.25.0 is tested against (see ngtcp2's README).
-PICOTLS_COMMIT = "f07f1c8c68b237f1468bc1f1fe1b68aba3ff23b4"
-PICOTLS_SHA256 = "6ecb4f8d9946c2b9342300b29627dc34e746a551d438d35af325a4495d62a6e3"
+NGTCP2_VERSION = "1.26.0"
+NGTCP2_SHA256 = "85174d674e7f8fd911a827c6e483fd417b21b1f54d7853dac464cee446c8d35f"
+# The picotls revision that ngtcp2 1.26.0 is tested against (see ngtcp2's README).
+PICOTLS_COMMIT = "a2d95de4c875d6dcb27658e476e3b624f4381bf0"
+PICOTLS_SHA256 = "d54263601c4652ef28451533bb2e2fae3f5f44aff54338cf5110b9c12c4bab3a"
 # Bump when ext/quic/patches/picotls/ or PicotlsRecipe::SOURCES changes;
 # installed? only checks for the archive.
 PICOTLS_PATCH_LEVEL = "p2"

data/ext/quic/include/quic/ext.h

@@ -14,7 +14,13 @@
  *   the table's. The structs below grow only by appending, which bumps
  *   abi_minor; reordering, removing or retyping a member bumps abi_major.
  *   Check `size` before calling a member added after the version you were
- *   built against. The handler struct follows the same rules.
+ *   built against. The handler struct follows the same rules:
+ *   set_stream_handler takes any handler at least as large as the ABI 1.0
+ *   one, and quic.so calls a member added later only when the handler's
+ *   `size` covers it. Every member `size` covers must be non-NULL.
+ *   A member added after ABI 1.0 is marked with the minor that brought it
+ *   (abi_minor N), and quic.so calls a handler member only when the table's
+ *   abi_minor is at least that N: an older quic.so leaves it uncalled.
  * - Exceptions: no function in the table and no handler function raises a
  *   Ruby exception; they return 0 or a negative error code. The one
  *   exception is conn_get, which raises TypeError for a wrong object and is
@@ -37,6 +43,8 @@
 #include <stdint.h>
 
 #define QUIC_EXT_ABI_MAJOR 1
+/* The abi_minor of the structs as this header declares them. */
+#define QUIC_EXT_ABI_MINOR 1
 
 #define QUIC_EXT_ERR_INVALID_STATE (-1)
 #define QUIC_EXT_ERR_STREAM_ID_BLOCKED (-2)
@@ -67,6 +75,19 @@ typedef struct {
   int (*stream_close)(void *ud, int64_t id, int has_code,
                       uint64_t app_error_code);
   int (*handshake_completed)(void *ud);
+  /* abi_minor 1 */
+  /* The peer sent STOP_SENDING on stream id, which this endpoint sends on
+     (stream_stop_sending is the other way: this endpoint stopped reading).
+     Called once per stream. Once it returns 0, ngtcp2 shuts the send side
+     and sends RESET_STREAM carrying app_error_code, unless all that was
+     sent, FIN included, has been acknowledged. next_stream_data should no
+     longer offer the stream; if it does, stream_shut_write follows. It can
+     come before any recv_stream_data, for a stream the peer has just
+     opened, and also comes for a unidirectional stream this endpoint
+     opened. stream_close may follow within the same #read_pkt. Calling
+     shutdown_stream_write here sends RESET_STREAM with that code instead,
+     but stream_close still reports app_error_code. */
+  int (*recv_stop_sending)(void *ud, int64_t id, uint64_t app_error_code);
 } quic_ext_stream_handler;
 
 typedef struct {

data/lib/quic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QUIC
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Yusuke Nakamura