fix: drop custom quic-go fork, use upstream

Signed-off-by: Christian Stewart <christian@aperture.us>

Author: paralin

doc/QUIC_GO.md

@@ -0,0 +1,105 @@
+# quic-go in Bifrost
+
+Bifrost uses [quic-go](https://github.com/quic-go/quic-go) as the underlying
+QUIC implementation for its peer-to-peer transport layer. QUIC provides
+multiplexed streams over a single connection with built-in encryption via TLS
+1.3, making it well-suited for bifrost's networking needs.
+
+## How Bifrost Uses quic-go
+
+Bifrost wraps quic-go to build authenticated P2P links between peers:
+
+- **transport/common/quic**: Core QUIC transport abstraction. Wraps `quic.Conn`
+  into bifrost `Link` objects with peer identity verification via mTLS
+  (libp2p-tls). Handles dialing, listening, and stream multiplexing.
+
+- **transport/common/pconn**: Packet-conn transport. Runs QUIC over raw UDP
+  sockets using `quic.Transport`. Used for direct UDP-based connections.
+
+- **transport/common/conn**: Ordered-conn transport. Runs QUIC over ordered
+  byte streams (e.g. TCP) by packetizing them with a custom `PacketConn`
+  adapter.
+
+- **transport/websocket**: Runs QUIC over WebSocket connections. WebSocket
+  frames are treated as packets for the QUIC layer.
+
+- **transport/webrtc**: Runs QUIC over WebRTC data channels. Enables
+  browser-to-browser and browser-to-native P2P connections.
+
+All transports negotiate peer identity using libp2p-tls certificates. The QUIC
+connection provides the stream multiplexing and flow control, while the TLS
+layer provides mutual authentication and peer identity verification.
+
+### Configuration
+
+QUIC configuration is built via `BuildQuicConfig(opts)` which maps bifrost
+`Opts` protobuf fields to `quic.Config`:
+
+- `MaxIdleTimeoutDur`: Connection idle timeout (default: 10s)
+- `MaxIncomingStreams`: Maximum concurrent streams (default: 100000)
+- `DisableDatagrams`: Disable QUIC datagram support
+- `DisableKeepAlive`: Disable keep-alive probes
+- `KeepAliveDur`: Custom keep-alive interval
+- `DisablePathMtuDiscovery`: Disable PMTU discovery (forced on for
+  non-UDP transports like WebSocket, WebRTC, and ordered conns)
+
+Bifrost uses QUIC Version 2 (RFC 9369) exclusively.
+
+## Fork History
+
+Bifrost previously used a fork at `github.com/aperturerobotics/quic-go`. The
+fork was created in January 2024 and maintained the following changes on top of
+upstream:
+
+1. **Configurable logrus logger**: Added `Logger *logrus.Entry` field to
+   `Config` and `Transport`, replacing quic-go's built-in logger (which uses
+   Go's `log` package and `QUIC_GO_LOG_LEVEL` env var) with logrus integration.
+   This was the primary reason for the fork.
+
+2. **`CloseNoError()` method**: Added a convenience method on `Connection` that
+   calls `closeLocal(nil)` and waits for context cancellation. Equivalent to
+   `CloseWithError(0, "")`.
+
+3. **Log level reductions**: Demoted ~9 log messages from Info/Error to Debug
+   level to reduce noise during normal operation.
+
+4. **Buffer size warning suppression**: Commented out UDP buffer size warnings
+   that print on startup when the OS buffer cannot be increased.
+
+5. **Multiplexer removal**: Removed the global connection multiplexer (upstream
+   later removed this independently).
+
+6. **Mutex deadlock fix**: Used `TryLock` pattern in `closeServer()` to avoid
+   a potential deadlock when closing transports.
+
+### Why the Fork Was Dropped
+
+As of February 2026, the fork was dropped in favor of upstream quic-go v0.59.0:
+
+- The `CloseNoError()` convenience method was replaced with the upstream
+  idiomatic `CloseWithError(0, "")` (one call site in bifrost).
+- The configurable logger was the only feature that truly required a fork.
+  Bifrost decided to accept upstream's default logging behavior (silent by
+  default, configurable via `QUIC_GO_LOG_LEVEL` env var) rather than maintain
+  a fork indefinitely.
+- Buffer size warnings can be suppressed via the
+  `QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING=true` env var.
+- Log level reductions are less important since upstream defaults to no logging.
+- The multiplexer was already removed upstream.
+- The deadlock fix was specific to the fork's older architecture and not
+  applicable to current upstream.
+
+## Upstream Wishlist
+
+Features that would benefit bifrost if added to upstream quic-go:
+
+1. **Configurable logger interface**: The ability to inject a custom logger
+   (e.g. `slog.Logger` or a simple interface) into `Config` or `Transport`
+   instead of relying on `QUIC_GO_LOG_LEVEL` + Go's `log` package. Upstream
+   has a TODO comment for this in `transport.go`. This was the primary reason
+   for the fork and would eliminate the need for any future fork.
+
+2. **Programmatic buffer warning control**: While
+   `QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING` exists, a programmatic way to
+   suppress or redirect the buffer size warning (e.g. via the logger interface
+   above) would be cleaner for library consumers.

go.mod

@@ -23,7 +23,6 @@ replace (
 	github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
 	github.com/multiformats/go-multiaddr => github.com/aperturerobotics/go-multiaddr v0.12.4-0.20240407071906-6f0354cc6755 // aperture
 	github.com/multiformats/go-multihash => github.com/aperturerobotics/go-multihash v0.2.3 // aperture
-	github.com/quic-go/quic-go => github.com/aperturerobotics/quic-go v0.48.2-0.20241029082227-fa76c393ee89 // aperture
 	github.com/sirupsen/logrus => github.com/aperturerobotics/logrus v1.9.4-0.20240119050608-13332fb58195 // aperture
 )
 
@@ -56,8 +55,6 @@ require (
 	github.com/bwesterb/go-ristretto v1.2.3 // indirect
 	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/google/pprof v0.0.0-20241017200806-017d972448fc // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
@@ -71,7 +68,6 @@ require (
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
 	github.com/pion/dtls/v3 v3.0.10 // indirect
 	github.com/pion/ice/v4 v4.2.0 // indirect
@@ -90,14 +86,10 @@ require (
 	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
-	go.uber.org/mock v0.5.0 // indirect
 	golang.org/x/mod v0.32.0 // indirect
 	golang.org/x/net v0.49.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.41.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

go.sum

@@ -30,8 +30,6 @@ github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 h1:4Dy3B
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4/go.mod h1:tMgO7y6SJo/d9ZcvrpNqIQtdYT9de+QmYaHOZ4KnhOg=
 github.com/aperturerobotics/protobuf-go-lite v0.12.1 h1:o9of87F/LFS2p5xfq32CrU99dvfqIAalTP7ZzoZK6Kg=
 github.com/aperturerobotics/protobuf-go-lite v0.12.1/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
-github.com/aperturerobotics/quic-go v0.48.2-0.20241029082227-fa76c393ee89 h1:MUXLrLDjCw36dx8OeBwF/B7YP5akyoU6Ps+v50qR5Lo=
-github.com/aperturerobotics/quic-go v0.48.2-0.20241029082227-fa76c393ee89/go.mod h1:vhhkHYq2i9lb0bOllqKhOdtg/3i7r4o/7zc8XI/T4lo=
 github.com/aperturerobotics/starpc v0.46.1 h1:RdyPA1UsU4WNj0ISzNQRcQvDk9hkwBrmRzpCrJD2XP0=
 github.com/aperturerobotics/starpc v0.46.1/go.mod h1:x1CyVEdQz1N90KtpEF6hv9Bn0gWSqoEx090mpnyPZIk=
 github.com/aperturerobotics/util v1.32.3 h1:wBc6L2guYMgLEzFwORH3CLMoMpfEqbV6pDqYervo3S0=
@@ -51,14 +49,8 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
-github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jnYVg3GBQy0qGBKmFQJwaPmpmxs=
-github.com/google/pprof v0.0.0-20241017200806-017d972448fc/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
@@ -69,10 +61,8 @@ github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+
 github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
@@ -93,10 +83,6 @@ github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf
 github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
 github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
 github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
-github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
-github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
-github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
-github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/paralin/ipfs-go-logrus v0.0.0-20240410105224-e24cb05f9e98 h1:8VijFMz4qJ70+ObyaByu6XZctKPhjllz/XfEoVZDQGo=
 github.com/paralin/ipfs-go-logrus v0.0.0-20240410105224-e24cb05f9e98/go.mod h1:8oFwKpIFewIJ9LrnO8dib4kQjKQQx7Ukq9sNZ+k50QU=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -141,6 +127,10 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
+github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sasha-s/go-deadlock v0.3.6 h1:TR7sfOnZ7x00tWPfD397Peodt57KzMDo+9Ae9rMiUmw=
 github.com/sasha-s/go-deadlock v0.3.6/go.mod h1:CUqNyyvMxTyjFqDT7MRg9mb4Dv/btmGTqSR+rky/UXo=
 github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 h1:7/iCYp2ii4GgbLhsT4uA8+vNHYYlSY5I5CS6/8e57hE=
@@ -161,8 +151,8 @@ github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
 github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
+go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
@@ -174,8 +164,6 @@ golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
 golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -186,12 +174,8 @@ golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
 golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
-golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

transport/common/conn/conn.go

@@ -92,7 +92,7 @@ func NewTransport(
 
 	var dialFn transport_quic.DialFunc
 	if addrDialer != nil {
-		dialFn = func(dctx context.Context, addr string) (quic.Connection, net.Addr, error) {
+		dialFn = func(dctx context.Context, addr string) (*quic.Conn, net.Addr, error) {
 			c, na, err := addrDialer(dctx, addr)
 			if err != nil {
 				return nil, nil, err

transport/common/pconn/pconn.go

@@ -86,7 +86,7 @@ func NewTransport(
 
 	var dialFn transport_quic.DialFunc
 	if addrParser != nil {
-		dialFn = func(ctx context.Context, addr string) (quic.Connection, net.Addr, error) {
+		dialFn = func(ctx context.Context, addr string) (*quic.Conn, net.Addr, error) {
 			// parse the addr to a net.Addr
 			na, err := addrParser(addr)
 			if err != nil {
@@ -125,7 +125,7 @@ func NewTransport(
 		return nil, err
 	}
 
-	tpt.quicConfig = transport_quic.BuildQuicConfig(le, opts.GetQuic())
+	tpt.quicConfig = transport_quic.BuildQuicConfig(opts.GetQuic())
 	tpt.quicTpt = &quic.Transport{Conn: pc}
 
 	return tpt, nil

transport/common/quic/config.go

@@ -7,18 +7,15 @@ import (
 	"github.com/aperturerobotics/bifrost/peer"
 	p2ptls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	quic "github.com/quic-go/quic-go"
-	"github.com/sirupsen/logrus"
 )
 
 // BuildQuicConfig constructs the quic config.
-func BuildQuicConfig(le *logrus.Entry, opts *Opts) *quic.Config {
-	// var enableMaxIdleTimeout bool
+func BuildQuicConfig(opts *Opts) *quic.Config {
 	maxIdleTimeout := time.Second * 10
 	if ntDur := opts.GetMaxIdleTimeoutDur(); ntDur != "" {
 		nt, err := time.ParseDuration(ntDur)
 		if err == nil && nt > time.Duration(0) && nt < time.Hour*2 {
 			maxIdleTimeout = nt
-			// enableMaxIdleTimeout = true
 		}
 	}
 
@@ -27,14 +24,6 @@ func BuildQuicConfig(le *logrus.Entry, opts *Opts) *quic.Config {
 		maxIncStreams = int(mis)
 	}
 
-	// copy the logger
-	le = &logrus.Entry{Logger: le.Logger, Context: le.Context}
-	if opts.GetVerbose() {
-		le.Level = logrus.DebugLevel
-	} else {
-		le.Level = logrus.InfoLevel
-	}
-
 	keepAlivePeriod := maxIdleTimeout / 2
 	if opts.GetDisableKeepAlive() {
 		keepAlivePeriod = 0
@@ -45,24 +34,17 @@ func BuildQuicConfig(le *logrus.Entry, opts *Opts) *quic.Config {
 		}
 	}
 
-	// _ = enableMaxIdleTimeout
 	return &quic.Config{
-		Logger: le,
-
 		// We don't use datagrams (yet), but this is necessary for WebTransport
 		EnableDatagrams:         !opts.GetDisableDatagrams(),
 		KeepAlivePeriod:         keepAlivePeriod,
 		DisablePathMTUDiscovery: opts.GetDisablePathMtuDiscovery(),
 
-		MaxIdleTimeout: maxIdleTimeout,
-		// DisableIdleTimeout:    !enableMaxIdleTimeout,
+		MaxIdleTimeout:       maxIdleTimeout,
 		MaxIncomingStreams:    int64(maxIncStreams),
 		MaxIncomingUniStreams: -1, // disable unidirectional streams
 
-		// MaxStreamReceiveWindow:     10 * (1 << 20), // 10 MB
-		// MaxConnectionReceiveWindow: 15 * (1 << 20), // 15 MB
-
-		Versions: []quic.Version{quic.Version2}, // {quic.Version1},
+		Versions: []quic.Version{quic.Version2},
 	}
 }
 

transport/common/quic/link.go

@@ -27,7 +27,7 @@ type Link struct {
 	// localAddr is the local address
 	localAddr net.Addr
 	// sess is the quic session
-	sess quic.Connection
+	sess *quic.Conn
 	// remotePeerID is the remote peer id
 	remotePeerID peer.ID
 	// remotePubKey is the remote public key
@@ -54,7 +54,7 @@ func NewLink(
 	localTransportUUID uint64,
 	localPeerID peer.ID,
 	localAddr net.Addr,
-	sess quic.Connection,
+	sess *quic.Conn,
 	closed func(),
 ) (*Link, error) {
 	remotePeerID, remotePubKey, err := DetermineSessionIdentity(sess)
@@ -167,13 +167,12 @@ func (l *Link) AcceptStream() (stream.Stream, stream.OpenOpts, error) {
 // Close closes the connection.
 func (l *Link) Close() error {
 	l.closedOnce.Do(func() {
-		// _ = l.sess.CloseWithError(quic.ApplicationErrorCode(0), "goodbye")
 		l.ctxCancel()
 		if closed := l.closed; closed != nil {
 			closed()
 		}
 		if l.sess != nil {
-			l.sess.CloseNoError()
+			_ = l.sess.CloseWithError(0, "")
 		}
 	})
 	return nil

transport/common/quic/quic.go

@@ -53,7 +53,7 @@ type Transport struct {
 
 // DialFunc is a function to dial a peer with a string address.
 // The function should parse the addr to a net.Addr.
-type DialFunc func(ctx context.Context, addr string) (quic.Connection, net.Addr, error)
+type DialFunc func(ctx context.Context, addr string) (*quic.Conn, net.Addr, error)
 
 // NewTransport constructs a new quic-backed based transport.
 func NewTransport(
@@ -201,7 +201,7 @@ func (t *Transport) HandleConn(ctx context.Context, dial bool, pc net.PacketConn
 		raddr = peer.NewNetAddr(peerID)
 	}
 
-	var sess quic.Connection
+	var sess *quic.Conn
 	var err error
 
 	t.le.Debugf("negotiating quic session with: %s", raddr.String())
@@ -240,7 +240,7 @@ func (t *Transport) HandleConn(ctx context.Context, dial bool, pc net.PacketConn
 }
 
 // HandleSession handles a new Quic session, creating & registering a link.
-func (t *Transport) HandleSession(ctx context.Context, sess quic.Connection) (*Link, error) {
+func (t *Transport) HandleSession(ctx context.Context, sess *quic.Conn) (*Link, error) {
 	t.mtx.Lock()
 	sessID := t.sessionCounter
 	t.sessionCounter++