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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Zig helpers for the wire formats of **[ethp2p](https://github.com/ethp2p/ethp2p)
| Broadcast trace writer (`.bctrace` NDJSON: header / event tuples / 100 ms footer time index; golden bytes from the Go writer) | [`sim/trace_writer.go`](https://github.com/ethp2p/ethp2p/blob/main/sim/trace_writer.go) | `sim.trace_writer` |
| Scenario stats collector (`NodeEvent` / `BandwidthEvent` / `ChunkStats` / `ScenarioStats`; publish/receive correlation → per-node delivery + latency, transport-byte totals, chunk-verdict tallies) — synchronous `record*` methods in place of Go's channel/goroutine `Run` | [`sim/collector.go`](https://github.com/ethp2p/ethp2p/blob/main/sim/collector.go) | `sim.collector` (`StatsCollector`) |
| QUIC transport + UNI stream alignment | [`sim/host.go`](https://github.com/ethp2p/ethp2p/blob/main/sim/host.go), `peer.go`, `peer_ctrl.go`, `peer_in.go` | `transport.eth_ec_quic`: IETF QUIC, TLS 1.3, ALPN `eth-ec-broadcast`, **unidirectional** BCAST/SESS/CHUNK streams matching `OpenUniStream`/`AcceptUniStream`; `PeerConn` + `broadcast.engine_quic` (`EngineQuicHost`) wire inbound SESS/CHUNK into `Engine` / `ChannelRs`. See [QUIC transport](#quic-transport-zquic). |
| QUIC incoming-stream limits (`MaxIncomingStreams` / `MaxIncomingUniStreams`) plumbed `EthEcQuicConfig` → `toQuicConfig` → shim `QuicConfig` (no longer silently dropped); applying them to the advertised transport params needs a zquic `ServerConfig` field (upstream follow-up) | [`sim/host.go`](https://github.com/ethp2p/ethp2p/blob/main/sim/host.go) `defaultQuicConfig` | `transport` (`zquic_quic_shim.QuicConfig`, `toQuicConfig`) |
| QUIC incoming-stream limits (`MaxIncomingStreams` / `MaxIncomingUniStreams`) plumbed `EthEcQuicConfig` → `toQuicConfig` → shim `QuicConfig` → zquic `io.ServerConfig.max_incoming_*` (v1.7.67+), advertised as `initial_max_streams_{bidi,uni}` so peers may open the configured number of per-chunk streams | [`sim/host.go`](https://github.com/ethp2p/ethp2p/blob/main/sim/host.go) `defaultQuicConfig` | `transport` (`zquic_quic_shim`, `toQuicConfig`) |
| **Still open** | — | [Pending work](#pending-work) |

## Scope on `main` (at a glance)
Expand Down
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
.dependencies = .{
.zquic = .{
.url = "https://github.com/ch4r10t33r/zquic/archive/refs/tags/v1.7.66.tar.gz",
.hash = "zquic-1.7.66-2zRc1EBVGACCVRmUoisIxS31Yt0feyFu80VYmgHn74Jw",
.url = "https://github.com/ch4r10t33r/zquic/archive/refs/tags/v1.7.67.tar.gz",
.hash = "zquic-1.7.67-2zRc1PloGACyDDFuvMhnCD-mrH32qc9fFe-6gX3R1FpU",
},
.zig_varint = .{
.url = "https://github.com/ch4r10t33r/zig-varint/archive/refs/tags/v0.1.0.tar.gz",
Expand Down
13 changes: 8 additions & 5 deletions src/transport/zquic_quic_shim.zig
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,10 @@ pub fn endpointInit(allocator: *std.mem.Allocator, bind_s: []const u8, qc: *Quic
var la_len: posix.socklen_t = @sizeOf(compat.Address);
try compat.getsockname(sock, &local_addr.any, &la_len);

// NOTE: `qc.max_incoming_streams` / `qc.max_incoming_uni_streams` reach
// here but cannot yet be applied — zquic's `io.ServerConfig` exposes no
// numeric incoming-stream limit (only `transport_params_preset`, whose
// `default` advertises `initial_max_streams_{bidi,uni} = 1000`). Honoring
// a custom limit needs a zquic `ServerConfig` field; tracked upstream.
// Advertise the configured per-connection incoming-stream limits
// (zquic `ServerConfig.max_incoming_*`, added in v1.7.67 → `initial_max_
// streams_{bidi,uni}`), so peers may open our configured number of
// per-chunk streams instead of the preset default (1000).
const scfg = io.ServerConfig{
.port = addr.getPort(),
.cert_path = cert_abs,
Expand All @@ -363,6 +362,8 @@ pub fn endpointInit(allocator: *std.mem.Allocator, bind_s: []const u8, qc: *Quic
.raw_application_streams = true,
.http09 = false,
.http3 = false,
.max_incoming_streams = qc.max_incoming_streams,
.max_incoming_uni_streams = qc.max_incoming_uni_streams,
};

const srv = try io.Server.initFromSocket(allocator.*, scfg, sock, true);
Expand Down Expand Up @@ -471,6 +472,8 @@ pub fn endpointInitFromFd(
.raw_application_streams = true,
.http09 = false,
.http3 = false,
.max_incoming_streams = qc.max_incoming_streams,
.max_incoming_uni_streams = qc.max_incoming_uni_streams,
};

const srv = try io.Server.initFromSocket(allocator.*, scfg, sock, false);
Expand Down
Loading