diff --git a/Changelog.md b/Changelog.md index 82df5fb2..3577ab65 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,109 +1,5 @@ # Changelog -## v0.22.0 (2021-07-25) +## v0.37.1 (2023-08-03) -- Use `ReadBatch` to read multiple UDP packets from the socket with a single syscall -- Add a config option (`Config.DisableVersionNegotiationPackets`) to disable sending of Version Negotiation packets -- Drop support for QUIC draft versions 32 and 34 -- Remove the `RetireBugBackwardsCompatibilityMode`, which was intended to mitigate a bug when retiring connection IDs in quic-go in v0.17.2 and ealier - -## v0.21.2 (2021-07-15) - -- Update qtls (for Go 1.15, 1.16 and 1.17rc1) to include the fix for the crypto/tls panic (see https://groups.google.com/g/golang-dev/c/5LJ2V7rd-Ag/m/YGLHVBZ6AAAJ for details) - -## v0.21.0 (2021-06-01) - -- quic-go now supports RFC 9000! - -## v0.20.0 (2021-03-19) - -- Remove the `quic.Config.HandshakeTimeout`. Introduce a `quic.Config.HandshakeIdleTimeout`. - -## v0.17.1 (2020-06-20) - -- Supports QUIC WG draft-29. -- Improve bundling of ACK frames (#2543). - -## v0.16.0 (2020-05-31) - -- Supports QUIC WG draft-28. - -## v0.15.0 (2020-03-01) - -- Supports QUIC WG draft-27. -- Add support for 0-RTT. -- Remove `Session.Close()`. Applications need to pass an application error code to the transport using `Session.CloseWithError()`. -- Make the TLS Cipher Suites configurable (via `tls.Config.CipherSuites`). - -## v0.14.0 (2019-12-04) - -- Supports QUIC WG draft-24. - -## v0.13.0 (2019-11-05) - -- Supports QUIC WG draft-23. -- Add an `EarlyListener` that allows sending of 0.5-RTT data. -- Add a `TokenStore` to store address validation tokens. -- Issue and use new connection IDs during a connection. - -## v0.12.0 (2019-08-05) - -- Implement HTTP/3. -- Rename `quic.Cookie` to `quic.Token` and `quic.Config.AcceptCookie` to `quic.Config.AcceptToken`. -- Distinguish between Retry tokens and tokens sent in NEW_TOKEN frames. -- Enforce application protocol negotiation (via `tls.Config.NextProtos`). -- Use a varint for error codes. -- Add support for [quic-trace](https://github.com/google/quic-trace). -- Add a context to `Listener.Accept`, `Session.Accept{Uni}Stream` and `Session.Open{Uni}StreamSync`. -- Implement TLS key updates. - -## v0.11.0 (2019-04-05) - -- Drop support for gQUIC. For qQUIC support, please switch to the *gquic* branch. -- Implement QUIC WG draft-19. -- Use [qtls](https://github.com/marten-seemann/qtls) for TLS 1.3. -- Return a `tls.ConnectionState` from `quic.Session.ConnectionState()`. -- Remove the error return values from `quic.Stream.CancelRead()` and `quic.Stream.CancelWrite()` - -## v0.10.0 (2018-08-28) - -- Add support for QUIC 44, drop support for QUIC 42. - -## v0.9.0 (2018-08-15) - -- Add a `quic.Config` option for the length of the connection ID (for IETF QUIC). -- Split Session.Close into one method for regular closing and one for closing with an error. - -## v0.8.0 (2018-06-26) - -- Add support for unidirectional streams (for IETF QUIC). -- Add a `quic.Config` option for the maximum number of incoming streams. -- Add support for QUIC 42 and 43. -- Add dial functions that use a context. -- Multiplex clients on a net.PacketConn, when using Dial(conn). - -## v0.7.0 (2018-02-03) - -- The lower boundary for packets included in ACKs is now derived, and the value sent in STOP_WAITING frames is ignored. -- Remove `DialNonFWSecure` and `DialAddrNonFWSecure`. -- Expose the `ConnectionState` in the `Session` (experimental API). -- Implement packet pacing. - -## v0.6.0 (2017-12-12) - -- Add support for QUIC 39, drop support for QUIC 35 - 37 -- Added `quic.Config` options for maximal flow control windows -- Add a `quic.Config` option for QUIC versions -- Add a `quic.Config` option to request omission of the connection ID from a server -- Add a `quic.Config` option to configure the source address validation -- Add a `quic.Config` option to configure the handshake timeout -- Add a `quic.Config` option to configure the idle timeout -- Add a `quic.Config` option to configure keep-alive -- Rename the STK to Cookie -- Implement `net.Conn`-style deadlines for streams -- Remove the `tls.Config` from the `quic.Config`. The `tls.Config` must now be passed to the `Dial` and `Listen` functions as a separate parameter. See the [Godoc](https://godoc.org/github.com/quic-go/quic-go) for details. -- Changed the log level environment variable to only accept strings ("DEBUG", "INFO", "ERROR"), see [the wiki](https://github.com/quic-go/quic-go/wiki/Logging) for more details. -- Rename the `h2quic.QuicRoundTripper` to `h2quic.RoundTripper` -- Changed `h2quic.Server.Serve()` to accept a `net.PacketConn` -- Drop support for Go 1.7 and 1.8. -- Various bugfixes +- Detached from quic-go/quic-go v0.37.1. \ No newline at end of file diff --git a/README.md b/README.md index ee9b6cde..519839bc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/refraction-networking/uquic/actions/workflows/go_1_20.yml/badge.svg?branch=master)](https://github.com/refraction-networking/uquic/actions)[![Build Status](https://github.com/refraction-networking/uquic/actions/workflows/go_1_21.yml/badge.svg?branch=master)](https://github.com/refraction-networking/uquic/actions) [![godoc](https://img.shields.io/badge/godoc-reference-blue.svg)](https://godoc.org/github.com/refraction-networking/uquic) --- -uQUIC is a fork of [quic-go](https://github.com/quic-go/quic-go), which provides Initial Packet fingerprinting resistance and other features. While the handshake is still performed by quic-go, this library provides interface to customize the unencrypted Initial Packet which may reveal fingerprint-able information. +uQUIC is a fork of [quic-go](https://github.com/refraction-networking/uquic), which provides Initial Packet fingerprinting resistance and other features. While the handshake is still performed by quic-go, this library provides interface to customize the unencrypted Initial Packet which may reveal fingerprint-able information. Golang 1.20+ is required. diff --git a/SECURITY.md b/SECURITY.md index c24c08f8..04ad20c0 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,7 +8,7 @@ please bring it to our attention right away! ## Reporting a Vulnerability If you find a vulnerability that may affect live deployments -- for example, by exposing -a remote execution exploit -- please [**report privately**](https://github.com/quic-go/quic-go/security/advisories/new). +a remote execution exploit -- please [**report privately**](https://github.com/refraction-networking/uquic/security/advisories/new). Please **DO NOT file a public issue**. If the issue is an implementation weakness that cannot be immediately exploited or @@ -16,4 +16,4 @@ something not yet deployed, just discuss it openly. ## Reporting a non security bug -For non-security bugs, please simply file a GitHub [issue](https://github.com/quic-go/quic-go/issues/new). +For non-security bugs, please simply file a GitHub [issue](https://github.com/refraction-networking/uquic/issues/new). diff --git a/buffer_pool.go b/buffer_pool.go index 48589e12..276260ae 100644 --- a/buffer_pool.go +++ b/buffer_pool.go @@ -3,7 +3,7 @@ package quic import ( "sync" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) type packetBuffer struct { diff --git a/buffer_pool_test.go b/buffer_pool_test.go index c565d4a4..32d13c79 100644 --- a/buffer_pool_test.go +++ b/buffer_pool_test.go @@ -1,7 +1,7 @@ package quic import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/client.go b/client.go index b6969573..2357c120 100644 --- a/client.go +++ b/client.go @@ -7,9 +7,9 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) type client struct { diff --git a/client_test.go b/client_test.go index f4f632d0..9ccf27de 100644 --- a/client_test.go +++ b/client_test.go @@ -8,10 +8,10 @@ import ( tls "github.com/refraction-networking/utls" - mocklogging "github.com/quic-go/quic-go/internal/mocks/logging" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + mocklogging "github.com/refraction-networking/uquic/internal/mocks/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" "github.com/golang/mock/gomock" diff --git a/closed_conn.go b/closed_conn.go index 0c988b53..071071c7 100644 --- a/closed_conn.go +++ b/closed_conn.go @@ -4,8 +4,8 @@ import ( "math/bits" "net" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // A closedLocalConn is a connection that we closed locally. diff --git a/closed_conn_test.go b/closed_conn_test.go index ac9da31e..40337998 100644 --- a/closed_conn_test.go +++ b/closed_conn_test.go @@ -3,8 +3,8 @@ package quic import ( "net" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/config.go b/config.go index de41656c..cf468d4f 100644 --- a/config.go +++ b/config.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" ) // Clone clones a Config diff --git a/config_test.go b/config_test.go index 1eca3d5d..02db453f 100644 --- a/config_test.go +++ b/config_test.go @@ -8,9 +8,9 @@ import ( "reflect" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/conn_id_generator.go b/conn_id_generator.go index 2d28dc61..aab6bb42 100644 --- a/conn_id_generator.go +++ b/conn_id_generator.go @@ -3,10 +3,10 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type connIDGenerator struct { diff --git a/conn_id_generator_test.go b/conn_id_generator_test.go index 2252de84..36e5db65 100644 --- a/conn_id_generator_test.go +++ b/conn_id_generator_test.go @@ -3,9 +3,9 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/conn_id_manager.go b/conn_id_manager.go index 7cb38e2e..49ca79ec 100644 --- a/conn_id_manager.go +++ b/conn_id_manager.go @@ -3,11 +3,11 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - list "github.com/quic-go/quic-go/internal/utils/linkedlist" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + list "github.com/refraction-networking/uquic/internal/utils/linkedlist" + "github.com/refraction-networking/uquic/internal/wire" ) type newConnID struct { diff --git a/conn_id_manager_test.go b/conn_id_manager_test.go index 40d848f1..41cff9c6 100644 --- a/conn_id_manager_test.go +++ b/conn_id_manager_test.go @@ -1,9 +1,9 @@ package quic import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/connection.go b/connection.go index a261859c..6756cc19 100644 --- a/connection.go +++ b/connection.go @@ -14,15 +14,15 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/logutils" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/logutils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" ) type unpacker interface { @@ -301,7 +301,7 @@ var newConnection = func( // different from protocol.DefaultActiveConnectionIDLimit. // If set to the default value, it will be omitted from the transport parameters, which will make // old quic-go versions interpret it as 0, instead of the default value of 2. - // See https://github.com/quic-go/quic-go/pull/3806. + // See https://github.com/refraction-networking/uquic/pull/3806. ActiveConnectionIDLimit: protocol.MaxActiveConnectionIDs, InitialSourceConnectionID: srcConnID, RetrySourceConnectionID: retrySrcConnID, @@ -411,7 +411,7 @@ var newClientConnection = func( // different from protocol.DefaultActiveConnectionIDLimit. // If set to the default value, it will be omitted from the transport parameters, which will make // old quic-go versions interpret it as 0, instead of the default value of 2. - // See https://github.com/quic-go/quic-go/pull/3806. + // See https://github.com/refraction-networking/uquic/pull/3806. ActiveConnectionIDLimit: protocol.MaxActiveConnectionIDs, InitialSourceConnectionID: srcConnID, } diff --git a/connection_test.go b/connection_test.go index cfd48ff0..8e033419 100644 --- a/connection_test.go +++ b/connection_test.go @@ -14,17 +14,17 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/mocks" - mockackhandler "github.com/quic-go/quic-go/internal/mocks/ackhandler" - mocklogging "github.com/quic-go/quic-go/internal/mocks/logging" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/testutils" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/mocks" + mockackhandler "github.com/refraction-networking/uquic/internal/mocks/ackhandler" + mocklogging "github.com/refraction-networking/uquic/internal/mocks/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/testutils" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" "github.com/golang/mock/gomock" diff --git a/connection_timer.go b/connection_timer.go index 171fdd01..303aa1f4 100644 --- a/connection_timer.go +++ b/connection_timer.go @@ -3,7 +3,7 @@ package quic import ( "time" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/utils" ) var deadlineSendImmediately = time.Time{}.Add(42 * time.Millisecond) // any value > time.Time{} and before time.Now() is fine diff --git a/crypto_stream.go b/crypto_stream.go index 4be2a07a..4ad097ce 100644 --- a/crypto_stream.go +++ b/crypto_stream.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type cryptoStream interface { diff --git a/crypto_stream_manager.go b/crypto_stream_manager.go index c48e238a..3aa22bbb 100644 --- a/crypto_stream_manager.go +++ b/crypto_stream_manager.go @@ -3,9 +3,9 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type cryptoDataHandler interface { diff --git a/crypto_stream_manager_test.go b/crypto_stream_manager_test.go index daffffe6..081ef5b6 100644 --- a/crypto_stream_manager_test.go +++ b/crypto_stream_manager_test.go @@ -1,8 +1,8 @@ package quic import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/crypto_stream_test.go b/crypto_stream_test.go index 9a4a2ee5..c875bcb5 100644 --- a/crypto_stream_test.go +++ b/crypto_stream_test.go @@ -3,9 +3,9 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/datagram_queue.go b/datagram_queue.go index ca80d404..fbd6a251 100644 --- a/datagram_queue.go +++ b/datagram_queue.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type datagramQueue struct { diff --git a/datagram_queue_test.go b/datagram_queue_test.go index de3f8f57..f581f429 100644 --- a/datagram_queue_test.go +++ b/datagram_queue_test.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/errors.go b/errors.go index c9fb0a07..fba74e86 100644 --- a/errors.go +++ b/errors.go @@ -3,7 +3,7 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/qerr" + "github.com/refraction-networking/uquic/internal/qerr" ) type ( diff --git a/example/client/main.go b/example/client/main.go index 9ef95f09..2ebe162f 100644 --- a/example/client/main.go +++ b/example/client/main.go @@ -15,12 +15,12 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/http3" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/qlog" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/http3" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/qlog" ) func main() { diff --git a/example/echo/echo.go b/example/echo/echo.go index 071a2662..e8962a77 100644 --- a/example/echo/echo.go +++ b/example/echo/echo.go @@ -13,7 +13,7 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) const addr = "localhost:4242" diff --git a/example/main.go b/example/main.go index 05814405..04cbb2af 100644 --- a/example/main.go +++ b/example/main.go @@ -18,12 +18,12 @@ import ( _ "net/http/pprof" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/http3" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/qlog" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/http3" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/qlog" ) type binds []string diff --git a/example/uquic/main.go b/example/uquic/main.go index 78bde371..55f92a8e 100644 --- a/example/uquic/main.go +++ b/example/uquic/main.go @@ -10,8 +10,8 @@ import ( tls "github.com/refraction-networking/utls" - quic "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/http3" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/http3" ) func main() { diff --git a/frame_sorter.go b/frame_sorter.go index bee0abad..c271a632 100644 --- a/frame_sorter.go +++ b/frame_sorter.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/quic-go/quic-go/internal/protocol" - list "github.com/quic-go/quic-go/internal/utils/linkedlist" + "github.com/refraction-networking/uquic/internal/protocol" + list "github.com/refraction-networking/uquic/internal/utils/linkedlist" ) // byteInterval is an interval from one ByteCount to the other diff --git a/frame_sorter_test.go b/frame_sorter_test.go index 9a684c91..1d585133 100644 --- a/frame_sorter_test.go +++ b/frame_sorter_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/framer.go b/framer.go index 9409af4c..3a3c415b 100644 --- a/framer.go +++ b/framer.go @@ -4,11 +4,11 @@ import ( "errors" "sync" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils/ringbuffer" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils/ringbuffer" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/quicvarint" ) type framer interface { diff --git a/framer_test.go b/framer_test.go index 9615e78e..9a6b0777 100644 --- a/framer_test.go +++ b/framer_test.go @@ -4,9 +4,9 @@ import ( "bytes" "math/rand" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" diff --git a/fuzzing/frames/cmd/corpus.go b/fuzzing/frames/cmd/corpus.go index 5baed928..5a07a9e9 100644 --- a/fuzzing/frames/cmd/corpus.go +++ b/fuzzing/frames/cmd/corpus.go @@ -6,10 +6,10 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) const version = protocol.Version1 diff --git a/fuzzing/frames/fuzz.go b/fuzzing/frames/fuzz.go index 44d2eee3..d22d363b 100644 --- a/fuzzing/frames/fuzz.go +++ b/fuzzing/frames/fuzz.go @@ -3,8 +3,8 @@ package frames import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) const version = protocol.Version1 diff --git a/fuzzing/handshake/cmd/corpus.go b/fuzzing/handshake/cmd/corpus.go index 0b2d3f7c..d1cf1b02 100644 --- a/fuzzing/handshake/cmd/corpus.go +++ b/fuzzing/handshake/cmd/corpus.go @@ -6,13 +6,13 @@ import ( tls "github.com/refraction-networking/utls" - fuzzhandshake "github.com/quic-go/quic-go/fuzzing/handshake" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + fuzzhandshake "github.com/refraction-networking/uquic/fuzzing/handshake" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) const alpn = "fuzz" diff --git a/fuzzing/handshake/fuzz.go b/fuzzing/handshake/fuzz.go index fc184d71..f017e1f0 100644 --- a/fuzzing/handshake/fuzz.go +++ b/fuzzing/handshake/fuzz.go @@ -15,11 +15,11 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) var ( diff --git a/fuzzing/header/cmd/corpus.go b/fuzzing/header/cmd/corpus.go index 226dc106..799d2a6c 100644 --- a/fuzzing/header/cmd/corpus.go +++ b/fuzzing/header/cmd/corpus.go @@ -5,10 +5,10 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/fuzzing/header" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/fuzzing/header" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) const version = protocol.Version1 diff --git a/fuzzing/header/fuzz.go b/fuzzing/header/fuzz.go index 62154f30..9b5a661d 100644 --- a/fuzzing/header/fuzz.go +++ b/fuzzing/header/fuzz.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) const version = protocol.Version1 diff --git a/fuzzing/tokens/fuzz.go b/fuzzing/tokens/fuzz.go index ea261fb6..61ac3f54 100644 --- a/fuzzing/tokens/fuzz.go +++ b/fuzzing/tokens/fuzz.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" ) func Fuzz(data []byte) int { diff --git a/fuzzing/transportparameters/cmd/corpus.go b/fuzzing/transportparameters/cmd/corpus.go index 9e59cfba..fdbb3d30 100644 --- a/fuzzing/transportparameters/cmd/corpus.go +++ b/fuzzing/transportparameters/cmd/corpus.go @@ -8,10 +8,10 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/fuzzing/transportparameters" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/fuzzing/transportparameters" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) func getRandomData(l int) []byte { diff --git a/fuzzing/transportparameters/fuzz.go b/fuzzing/transportparameters/fuzz.go index a3ca143d..6e645f58 100644 --- a/fuzzing/transportparameters/fuzz.go +++ b/fuzzing/transportparameters/fuzz.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/quic-go/quic-go/fuzzing/internal/helper" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/fuzzing/internal/helper" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) // PrefixLen is the number of bytes used for configuration diff --git a/go.mod b/go.mod index 70085c11..1bf21741 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,20 @@ -module github.com/quic-go/quic-go +module github.com/refraction-networking/uquic go 1.20 -replace github.com/refraction-networking/utls => ../utls - require ( github.com/francoispqt/gojay v1.2.13 github.com/gaukas/clienthellod v0.4.0 github.com/golang/mock v1.6.0 - github.com/onsi/ginkgo/v2 v2.9.5 - github.com/onsi/gomega v1.27.6 + github.com/onsi/ginkgo/v2 v2.11.0 + github.com/onsi/gomega v1.27.10 github.com/quic-go/qpack v0.4.0 - github.com/refraction-networking/utls v1.3.2 - golang.org/x/crypto v0.10.0 - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db - golang.org/x/net v0.11.0 - golang.org/x/sync v0.2.0 - golang.org/x/sys v0.9.0 + github.com/refraction-networking/utls v1.3.3 + golang.org/x/crypto v0.11.0 + golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b + golang.org/x/net v0.13.0 + golang.org/x/sync v0.3.0 + golang.org/x/sys v0.10.0 ) require ( @@ -26,11 +24,10 @@ require ( github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gopacket v1.1.19 // indirect - github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect - github.com/klauspost/compress v1.16.6 // indirect - golang.org/x/mod v0.10.0 // indirect - golang.org/x/text v0.10.0 // indirect - golang.org/x/tools v0.9.1 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 // indirect + github.com/klauspost/compress v1.16.7 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/text v0.11.0 // indirect + golang.org/x/tools v0.11.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 20095f99..e9ee11a0 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,8 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 h1:ZgoomqkdjGbQ3+qQXCkvYMCDvGDNg2k5JJDjjdTB6jY= +github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -72,11 +74,11 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -86,10 +88,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -100,6 +102,8 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/refraction-networking/utls v1.3.3 h1:f/TBLX7KBciRyFH3bwupp+CE4fzoYKCirhdRcC490sw= +github.com/refraction-networking/utls v1.3.3/go.mod h1:DlecWW1LMlMJu+9qpzzQqdHDT/C2LAe03EdpLUz/RL8= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= @@ -141,19 +145,21 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI= +golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -165,8 +171,8 @@ golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY= +golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -178,8 +184,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -190,14 +196,14 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -208,8 +214,10 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.11.1 h1:ojD5zOW8+7dOGzdnNgersm8aPfcDjhMp12UfG93NIMc= +golang.org/x/tools v0.11.1/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -230,9 +238,8 @@ google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9M google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/http3/body.go b/http3/body.go index 63ff4366..315825b2 100644 --- a/http3/body.go +++ b/http3/body.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) // The HTTPStreamer allows taking over a HTTP/3 stream. The interface is implemented by: diff --git a/http3/body_test.go b/http3/body_test.go index 5bcca2e9..0f64bc76 100644 --- a/http3/body_test.go +++ b/http3/body_test.go @@ -3,8 +3,8 @@ package http3 import ( "errors" - "github.com/quic-go/quic-go" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" + quic "github.com/refraction-networking/uquic" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/http3/capsule.go b/http3/capsule.go index 7bdcd4e5..bde05b54 100644 --- a/http3/capsule.go +++ b/http3/capsule.go @@ -3,7 +3,7 @@ package http3 import ( "io" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/quicvarint" ) // CapsuleType is the type of the capsule. diff --git a/http3/capsule_test.go b/http3/capsule_test.go index 4920e887..9c06e3a6 100644 --- a/http3/capsule_test.go +++ b/http3/capsule_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/http3/client.go b/http3/client.go index abc43037..974a81e1 100644 --- a/http3/client.go +++ b/http3/client.go @@ -16,10 +16,10 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" "github.com/quic-go/qpack" ) diff --git a/http3/client_test.go b/http3/client_test.go index 61080de3..5b56a1fb 100644 --- a/http3/client_test.go +++ b/http3/client_test.go @@ -11,13 +11,13 @@ import ( "sync" "time" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" "github.com/golang/mock/gomock" "github.com/quic-go/qpack" diff --git a/http3/error_codes.go b/http3/error_codes.go index 67b215d8..515c675e 100644 --- a/http3/error_codes.go +++ b/http3/error_codes.go @@ -3,7 +3,7 @@ package http3 import ( "fmt" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) type ErrCode quic.ApplicationErrorCode diff --git a/http3/frames.go b/http3/frames.go index cdd97bc5..7897b86f 100644 --- a/http3/frames.go +++ b/http3/frames.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // FrameType is the frame type of a HTTP/3 frame diff --git a/http3/frames_test.go b/http3/frames_test.go index 04e583d2..ed56c74a 100644 --- a/http3/frames_test.go +++ b/http3/frames_test.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/http3/http_stream.go b/http3/http_stream.go index 1c0ec4f1..df62254e 100644 --- a/http3/http_stream.go +++ b/http3/http_stream.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/utils" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/utils" ) // A Stream is a HTTP/3 stream. diff --git a/http3/http_stream_test.go b/http3/http_stream_test.go index cff5476b..4f87ee55 100644 --- a/http3/http_stream_test.go +++ b/http3/http_stream_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" + quic "github.com/refraction-networking/uquic" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/http3/mock_quic_early_listener_test.go b/http3/mock_quic_early_listener_test.go index ab40f060..0e7cf685 100644 --- a/http3/mock_quic_early_listener_test.go +++ b/http3/mock_quic_early_listener_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/http3 (interfaces: QUICEarlyListener) +// Source: github.com/refraction-networking/uquic/http3 (interfaces: QUICEarlyListener) // Package http3 is a generated GoMock package. package http3 @@ -10,7 +10,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - quic "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) // MockQUICEarlyListener is a mock of QUICEarlyListener interface. diff --git a/http3/mock_roundtripcloser_test.go b/http3/mock_roundtripcloser_test.go index 7aa19ee3..f9a82130 100644 --- a/http3/mock_roundtripcloser_test.go +++ b/http3/mock_roundtripcloser_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/http3 (interfaces: RoundTripCloser) +// Source: github.com/refraction-networking/uquic/http3 (interfaces: RoundTripCloser) // Package http3 is a generated GoMock package. package http3 diff --git a/http3/mockgen.go b/http3/mockgen.go index 38939e60..a8185a97 100644 --- a/http3/mockgen.go +++ b/http3/mockgen.go @@ -2,7 +2,7 @@ package http3 -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package http3 -destination mock_roundtripcloser_test.go github.com/quic-go/quic-go/http3 RoundTripCloser" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package http3 -destination mock_roundtripcloser_test.go github.com/refraction-networking/uquic/http3 RoundTripCloser" type RoundTripCloser = roundTripCloser -//go:generate sh -c "go run github.com/golang/mock/mockgen -package http3 -destination mock_quic_early_listener_test.go github.com/quic-go/quic-go/http3 QUICEarlyListener" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package http3 -destination mock_quic_early_listener_test.go github.com/refraction-networking/uquic/http3 QUICEarlyListener" diff --git a/http3/request_writer.go b/http3/request_writer.go index 875f4031..d423ac09 100644 --- a/http3/request_writer.go +++ b/http3/request_writer.go @@ -16,8 +16,8 @@ import ( "golang.org/x/net/idna" "github.com/quic-go/qpack" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/utils" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/utils" ) const bodyCopyBufferSize = 8 * 1024 diff --git a/http3/request_writer_test.go b/http3/request_writer_test.go index 74fd2398..9de46f90 100644 --- a/http3/request_writer_test.go +++ b/http3/request_writer_test.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" - "github.com/quic-go/quic-go/internal/utils" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" + "github.com/refraction-networking/uquic/internal/utils" "github.com/golang/mock/gomock" "github.com/quic-go/qpack" diff --git a/http3/response_writer.go b/http3/response_writer.go index 3d927185..2262f16c 100644 --- a/http3/response_writer.go +++ b/http3/response_writer.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/utils" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/utils" "github.com/quic-go/qpack" ) diff --git a/http3/response_writer_test.go b/http3/response_writer_test.go index c803adb7..8563ae8a 100644 --- a/http3/response_writer_test.go +++ b/http3/response_writer_test.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" - "github.com/quic-go/quic-go/internal/utils" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" + "github.com/refraction-networking/uquic/internal/utils" "github.com/golang/mock/gomock" "github.com/quic-go/qpack" diff --git a/http3/roundtrip.go b/http3/roundtrip.go index ae589438..df8bc409 100644 --- a/http3/roundtrip.go +++ b/http3/roundtrip.go @@ -11,11 +11,10 @@ import ( "sync" "sync/atomic" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" "golang.org/x/net/http/httpguts" - - "github.com/quic-go/quic-go" ) type roundTripCloser interface { diff --git a/http3/roundtrip_test.go b/http3/roundtrip_test.go index 6f274615..279308fd 100644 --- a/http3/roundtrip_test.go +++ b/http3/roundtrip_test.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "time" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/qerr" + "github.com/refraction-networking/uquic/internal/qerr" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/http3/server.go b/http3/server.go index fc4f3986..b32e80ed 100644 --- a/http3/server.go +++ b/http3/server.go @@ -15,10 +15,10 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" "github.com/quic-go/qpack" ) diff --git a/http3/server_test.go b/http3/server_test.go index 64138e49..b33c0f59 100644 --- a/http3/server_test.go +++ b/http3/server_test.go @@ -14,12 +14,12 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - mockquic "github.com/quic-go/quic-go/internal/mocks/quic" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + quic "github.com/refraction-networking/uquic" + mockquic "github.com/refraction-networking/uquic/internal/mocks/quic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" "github.com/golang/mock/gomock" "github.com/quic-go/qpack" diff --git a/http3/u_roundtrip.go b/http3/u_roundtrip.go index 8e61741f..079f2d4d 100644 --- a/http3/u_roundtrip.go +++ b/http3/u_roundtrip.go @@ -7,7 +7,7 @@ import ( "net" "net/http" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" "golang.org/x/net/http/httpguts" ) diff --git a/integrationtests/gomodvendor/go.mod b/integrationtests/gomodvendor/go.mod index c37e26d6..a47ba643 100644 --- a/integrationtests/gomodvendor/go.mod +++ b/integrationtests/gomodvendor/go.mod @@ -3,6 +3,6 @@ module test go 1.16 // The version doesn't matter here, as we're replacing it with the currently checked out code anyway. -require github.com/quic-go/quic-go v0.21.0 +require github.com/refraction-networking/uquic v0.21.0 -replace github.com/quic-go/quic-go => ../../ +replace github.com/refraction-networking/uquic => ../../ diff --git a/integrationtests/gomodvendor/main.go b/integrationtests/gomodvendor/main.go index b19bd3fd..8f28c7cb 100644 --- a/integrationtests/gomodvendor/main.go +++ b/integrationtests/gomodvendor/main.go @@ -1,6 +1,6 @@ package main -import "github.com/quic-go/quic-go/http3" +import "github.com/refraction-networking/uquic/http3" // The contents of this script don't matter. // We just need to make sure that quic-go is imported. diff --git a/integrationtests/self/benchmark_test.go b/integrationtests/self/benchmark_test.go index 983d8b7d..cbeaaac7 100644 --- a/integrationtests/self/benchmark_test.go +++ b/integrationtests/self/benchmark_test.go @@ -6,7 +6,7 @@ import ( "net" "testing" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) func BenchmarkHandshake(b *testing.B) { diff --git a/integrationtests/self/cancelation_test.go b/integrationtests/self/cancelation_test.go index 5f95c0b7..54c78abd 100644 --- a/integrationtests/self/cancelation_test.go +++ b/integrationtests/self/cancelation_test.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -172,7 +172,7 @@ var _ = Describe("Stream Cancellations", func() { It("allows concurrent Read and CancelRead calls", func() { // This test is especially valuable when run with race detector, - // see https://github.com/quic-go/quic-go/issues/3239. + // see https://github.com/refraction-networking/uquic/issues/3239. serverCanceledCounterChan := runServer(make([]byte, 100)) // make sure the FIN is sent with the STREAM frame conn, err := quic.DialAddr( diff --git a/integrationtests/self/close_test.go b/integrationtests/self/close_test.go index d0bcf7f0..898dec2d 100644 --- a/integrationtests/self/close_test.go +++ b/integrationtests/self/close_test.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/conn_id_test.go b/integrationtests/self/conn_id_test.go index 0d8c4b44..fd73451d 100644 --- a/integrationtests/self/conn_id_test.go +++ b/integrationtests/self/conn_id_test.go @@ -8,8 +8,8 @@ import ( mrand "math/rand" "net" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/datagram_test.go b/integrationtests/self/datagram_test.go index 35d0718a..8703e4b4 100644 --- a/integrationtests/self/datagram_test.go +++ b/integrationtests/self/datagram_test.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/wire" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/deadline_test.go b/integrationtests/self/deadline_test.go index b165aff0..95914ac5 100644 --- a/integrationtests/self/deadline_test.go +++ b/integrationtests/self/deadline_test.go @@ -7,10 +7,9 @@ import ( "net" "time" - "github.com/quic-go/quic-go" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + quic "github.com/refraction-networking/uquic" ) var _ = Describe("Stream deadline tests", func() { diff --git a/integrationtests/self/drop_test.go b/integrationtests/self/drop_test.go index 4eac657a..14f0a618 100644 --- a/integrationtests/self/drop_test.go +++ b/integrationtests/self/drop_test.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/early_data_test.go b/integrationtests/self/early_data_test.go index 136c3d0b..3ad0ca4d 100644 --- a/integrationtests/self/early_data_test.go +++ b/integrationtests/self/early_data_test.go @@ -7,8 +7,8 @@ import ( "net" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/handshake_drop_test.go b/integrationtests/self/handshake_drop_test.go index d5920476..c099d9fa 100644 --- a/integrationtests/self/handshake_drop_test.go +++ b/integrationtests/self/handshake_drop_test.go @@ -10,13 +10,13 @@ import ( "sync/atomic" "time" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/quicvarint" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/wire" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/handshake_rtt_test.go b/integrationtests/self/handshake_rtt_test.go index 52f04b1a..ef453a98 100644 --- a/integrationtests/self/handshake_rtt_test.go +++ b/integrationtests/self/handshake_rtt_test.go @@ -7,10 +7,10 @@ import ( "net" "time" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/handshake_test.go b/integrationtests/self/handshake_test.go index e5f4135e..6350d0c7 100644 --- a/integrationtests/self/handshake_test.go +++ b/integrationtests/self/handshake_test.go @@ -10,10 +10,10 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/qtls" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/qtls" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/hotswap_test.go b/integrationtests/self/hotswap_test.go index ac75a494..e7dca2b1 100644 --- a/integrationtests/self/hotswap_test.go +++ b/integrationtests/self/hotswap_test.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/http3" + "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/http3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/http_test.go b/integrationtests/self/http_test.go index e41dc85e..d0474ad3 100644 --- a/integrationtests/self/http_test.go +++ b/integrationtests/self/http_test.go @@ -16,8 +16,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/http3" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/http3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/key_update_test.go b/integrationtests/self/key_update_test.go index c24bef27..af1ba5bd 100644 --- a/integrationtests/self/key_update_test.go +++ b/integrationtests/self/key_update_test.go @@ -6,10 +6,10 @@ import ( "io" "net" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/mitm_test.go b/integrationtests/self/mitm_test.go index a5f07f77..b9491b25 100644 --- a/integrationtests/self/mitm_test.go +++ b/integrationtests/self/mitm_test.go @@ -12,11 +12,11 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/testutils" - "github.com/quic-go/quic-go/internal/wire" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/testutils" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/multiplex_test.go b/integrationtests/self/multiplex_test.go index 9b00bc34..92a23025 100644 --- a/integrationtests/self/multiplex_test.go +++ b/integrationtests/self/multiplex_test.go @@ -7,10 +7,9 @@ import ( "runtime" "time" - "github.com/quic-go/quic-go" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + quic "github.com/refraction-networking/uquic" ) var _ = Describe("Multiplexing", func() { diff --git a/integrationtests/self/packetization_test.go b/integrationtests/self/packetization_test.go index 740956c5..7a35c32a 100644 --- a/integrationtests/self/packetization_test.go +++ b/integrationtests/self/packetization_test.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/resumption_test.go b/integrationtests/self/resumption_test.go index ca01e741..3e827cb8 100644 --- a/integrationtests/self/resumption_test.go +++ b/integrationtests/self/resumption_test.go @@ -6,10 +6,9 @@ import ( "net" "time" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integrationtests/self/rtt_test.go b/integrationtests/self/rtt_test.go index 97d9b981..8e94c2a4 100644 --- a/integrationtests/self/rtt_test.go +++ b/integrationtests/self/rtt_test.go @@ -7,8 +7,8 @@ import ( "net" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go index 8aeca8fb..f2efc18c 100644 --- a/integrationtests/self/self_suite_test.go +++ b/integrationtests/self/self_suite_test.go @@ -17,12 +17,12 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/integrationtests/tools" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/integrationtests/tools" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/stateless_reset_test.go b/integrationtests/self/stateless_reset_test.go index 8db9477b..959e2538 100644 --- a/integrationtests/self/stateless_reset_test.go +++ b/integrationtests/self/stateless_reset_test.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/stream_test.go b/integrationtests/self/stream_test.go index 332cd505..afef5539 100644 --- a/integrationtests/self/stream_test.go +++ b/integrationtests/self/stream_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/quic-go/quic-go" + quic "github.com/refraction-networking/uquic" ) var _ = Describe("Bidirectional streams", func() { diff --git a/integrationtests/self/timeout_test.go b/integrationtests/self/timeout_test.go index c5ec46d4..b70a6fe3 100644 --- a/integrationtests/self/timeout_test.go +++ b/integrationtests/self/timeout_test.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/tracer_test.go b/integrationtests/self/tracer_test.go index 3bfae3c6..db0ba598 100644 --- a/integrationtests/self/tracer_test.go +++ b/integrationtests/self/tracer_test.go @@ -9,11 +9,11 @@ import ( mrand "math/rand" "net" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/qlog" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/qlog" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/uni_stream_test.go b/integrationtests/self/uni_stream_test.go index a2fe4e50..ef0f0842 100644 --- a/integrationtests/self/uni_stream_test.go +++ b/integrationtests/self/uni_stream_test.go @@ -7,8 +7,8 @@ import ( "net" "sync" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/zero_rtt_oldgo_test.go b/integrationtests/self/zero_rtt_oldgo_test.go index 7ff94d35..919e9947 100644 --- a/integrationtests/self/zero_rtt_oldgo_test.go +++ b/integrationtests/self/zero_rtt_oldgo_test.go @@ -12,13 +12,13 @@ import ( "sync/atomic" "time" + "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/self/zero_rtt_test.go b/integrationtests/self/zero_rtt_test.go index e1f35d1d..5021e43f 100644 --- a/integrationtests/self/zero_rtt_test.go +++ b/integrationtests/self/zero_rtt_test.go @@ -5,7 +5,6 @@ package self_test import ( "context" "fmt" - tls "github.com/refraction-networking/utls" "io" mrand "math/rand" "net" @@ -13,11 +12,13 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + tls "github.com/refraction-networking/utls" + + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/tools/proxy/proxy.go b/integrationtests/tools/proxy/proxy.go index 4ed2d89d..322a18f9 100644 --- a/integrationtests/tools/proxy/proxy.go +++ b/integrationtests/tools/proxy/proxy.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // Connection is a UDP connection diff --git a/integrationtests/tools/proxy/proxy_test.go b/integrationtests/tools/proxy/proxy_test.go index 81e13b23..b89caabd 100644 --- a/integrationtests/tools/proxy/proxy_test.go +++ b/integrationtests/tools/proxy/proxy_test.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/tools/qlog.go b/integrationtests/tools/qlog.go index 352e0a61..9dcaac8d 100644 --- a/integrationtests/tools/qlog.go +++ b/integrationtests/tools/qlog.go @@ -8,10 +8,10 @@ import ( "log" "os" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/qlog" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/qlog" ) func NewQlogger(logger io.Writer) func(context.Context, logging.Perspective, quic.ConnectionID) logging.ConnectionTracer { diff --git a/integrationtests/versionnegotiation/handshake_test.go b/integrationtests/versionnegotiation/handshake_test.go index 50274932..f68cfac0 100644 --- a/integrationtests/versionnegotiation/handshake_test.go +++ b/integrationtests/versionnegotiation/handshake_test.go @@ -7,10 +7,10 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/integrationtests/tools/israce" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/integrationtests/tools/israce" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/versionnegotiation/rtt_test.go b/integrationtests/versionnegotiation/rtt_test.go index ce9cba1b..d35701d1 100644 --- a/integrationtests/versionnegotiation/rtt_test.go +++ b/integrationtests/versionnegotiation/rtt_test.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/quic-go/quic-go" - quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" - "github.com/quic-go/quic-go/internal/protocol" + quic "github.com/refraction-networking/uquic" + quicproxy "github.com/refraction-networking/uquic/integrationtests/tools/proxy" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integrationtests/versionnegotiation/versionnegotiation_suite_test.go b/integrationtests/versionnegotiation/versionnegotiation_suite_test.go index d8d9f38f..ad7a9123 100644 --- a/integrationtests/versionnegotiation/versionnegotiation_suite_test.go +++ b/integrationtests/versionnegotiation/versionnegotiation_suite_test.go @@ -6,12 +6,11 @@ import ( "flag" "testing" + quic "github.com/refraction-networking/uquic" tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/integrationtests/tools" - "github.com/quic-go/quic-go/logging" - - "github.com/quic-go/quic-go" + "github.com/refraction-networking/uquic/integrationtests/tools" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/interface.go b/interface.go index dbfedccf..27271d54 100644 --- a/interface.go +++ b/interface.go @@ -9,9 +9,9 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" ) // The StreamID is the ID of a QUIC stream. diff --git a/internal/ackhandler/ack_eliciting.go b/internal/ackhandler/ack_eliciting.go index 34506b12..6c8f851f 100644 --- a/internal/ackhandler/ack_eliciting.go +++ b/internal/ackhandler/ack_eliciting.go @@ -1,6 +1,6 @@ package ackhandler -import "github.com/quic-go/quic-go/internal/wire" +import "github.com/refraction-networking/uquic/internal/wire" // IsFrameAckEliciting returns true if the frame is ack-eliciting. func IsFrameAckEliciting(f wire.Frame) bool { diff --git a/internal/ackhandler/ack_eliciting_test.go b/internal/ackhandler/ack_eliciting_test.go index cdd1c7e9..4427c216 100644 --- a/internal/ackhandler/ack_eliciting_test.go +++ b/internal/ackhandler/ack_eliciting_test.go @@ -3,7 +3,7 @@ package ackhandler import ( "reflect" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/ackhandler.go b/internal/ackhandler/ackhandler.go index 2c7cc4fc..9d0fa84c 100644 --- a/internal/ackhandler/ackhandler.go +++ b/internal/ackhandler/ackhandler.go @@ -1,9 +1,9 @@ package ackhandler import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) // NewAckHandler creates a new SentPacketHandler and a new ReceivedPacketHandler. diff --git a/internal/ackhandler/frame.go b/internal/ackhandler/frame.go index e03a8080..e1ededde 100644 --- a/internal/ackhandler/frame.go +++ b/internal/ackhandler/frame.go @@ -1,7 +1,7 @@ package ackhandler import ( - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/wire" ) // FrameHandler handles the acknowledgement and the loss of a frame. diff --git a/internal/ackhandler/interfaces.go b/internal/ackhandler/interfaces.go index ba95f8a9..b478ef77 100644 --- a/internal/ackhandler/interfaces.go +++ b/internal/ackhandler/interfaces.go @@ -3,8 +3,8 @@ package ackhandler import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) // SentPacketHandler handles ACKs received for outgoing packets diff --git a/internal/ackhandler/mock_sent_packet_tracker_test.go b/internal/ackhandler/mock_sent_packet_tracker_test.go index 83c28fd5..fecb3272 100644 --- a/internal/ackhandler/mock_sent_packet_tracker_test.go +++ b/internal/ackhandler/mock_sent_packet_tracker_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/ackhandler (interfaces: SentPacketTracker) +// Source: github.com/refraction-networking/uquic/internal/ackhandler (interfaces: SentPacketTracker) // Package ackhandler is a generated GoMock package. package ackhandler @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockSentPacketTracker is a mock of SentPacketTracker interface. diff --git a/internal/ackhandler/mockgen.go b/internal/ackhandler/mockgen.go index d6178367..b432a0a0 100644 --- a/internal/ackhandler/mockgen.go +++ b/internal/ackhandler/mockgen.go @@ -2,5 +2,5 @@ package ackhandler -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package ackhandler -destination mock_sent_packet_tracker_test.go github.com/quic-go/quic-go/internal/ackhandler SentPacketTracker" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package ackhandler -destination mock_sent_packet_tracker_test.go github.com/refraction-networking/uquic/internal/ackhandler SentPacketTracker" type SentPacketTracker = sentPacketTracker diff --git a/internal/ackhandler/packet.go b/internal/ackhandler/packet.go index 5f43689b..04ca3bb4 100644 --- a/internal/ackhandler/packet.go +++ b/internal/ackhandler/packet.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A Packet is a packet diff --git a/internal/ackhandler/packet_number_generator.go b/internal/ackhandler/packet_number_generator.go index e84171e3..b29db772 100644 --- a/internal/ackhandler/packet_number_generator.go +++ b/internal/ackhandler/packet_number_generator.go @@ -1,8 +1,8 @@ package ackhandler import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) type packetNumberGenerator interface { diff --git a/internal/ackhandler/packet_number_generator_test.go b/internal/ackhandler/packet_number_generator_test.go index 4384c8f8..eafa9015 100644 --- a/internal/ackhandler/packet_number_generator_test.go +++ b/internal/ackhandler/packet_number_generator_test.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/received_packet_handler.go b/internal/ackhandler/received_packet_handler.go index e11ee1ee..4d7d6f6d 100644 --- a/internal/ackhandler/received_packet_handler.go +++ b/internal/ackhandler/received_packet_handler.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type receivedPacketHandler struct { diff --git a/internal/ackhandler/received_packet_handler_test.go b/internal/ackhandler/received_packet_handler_test.go index b07d6178..d0377200 100644 --- a/internal/ackhandler/received_packet_handler_test.go +++ b/internal/ackhandler/received_packet_handler_test.go @@ -5,9 +5,9 @@ import ( "github.com/golang/mock/gomock" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/received_packet_history.go b/internal/ackhandler/received_packet_history.go index 3143bfe1..4c9d8e51 100644 --- a/internal/ackhandler/received_packet_history.go +++ b/internal/ackhandler/received_packet_history.go @@ -3,9 +3,9 @@ package ackhandler import ( "sync" - "github.com/quic-go/quic-go/internal/protocol" - list "github.com/quic-go/quic-go/internal/utils/linkedlist" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + list "github.com/refraction-networking/uquic/internal/utils/linkedlist" + "github.com/refraction-networking/uquic/internal/wire" ) // interval is an interval from one PacketNumber to the other diff --git a/internal/ackhandler/received_packet_history_test.go b/internal/ackhandler/received_packet_history_test.go index af6385be..92dd7049 100644 --- a/internal/ackhandler/received_packet_history_test.go +++ b/internal/ackhandler/received_packet_history_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "sort" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/received_packet_tracker.go b/internal/ackhandler/received_packet_tracker.go index b1883866..2d8a813b 100644 --- a/internal/ackhandler/received_packet_tracker.go +++ b/internal/ackhandler/received_packet_tracker.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) // number of ack-eliciting packets received before sending an ack. diff --git a/internal/ackhandler/received_packet_tracker_test.go b/internal/ackhandler/received_packet_tracker_test.go index 4818bd09..9e6b72de 100644 --- a/internal/ackhandler/received_packet_tracker_test.go +++ b/internal/ackhandler/received_packet_tracker_test.go @@ -3,9 +3,9 @@ package ackhandler import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/sent_packet_handler.go b/internal/ackhandler/sent_packet_handler.go index 08684aa2..3ba7e586 100644 --- a/internal/ackhandler/sent_packet_handler.go +++ b/internal/ackhandler/sent_packet_handler.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/congestion" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/congestion" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" ) const ( diff --git a/internal/ackhandler/sent_packet_handler_test.go b/internal/ackhandler/sent_packet_handler_test.go index 6c603c87..9b21d1fe 100644 --- a/internal/ackhandler/sent_packet_handler_test.go +++ b/internal/ackhandler/sent_packet_handler_test.go @@ -6,11 +6,11 @@ import ( "github.com/golang/mock/gomock" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/sent_packet_history.go b/internal/ackhandler/sent_packet_history.go index c14c0f49..a621a939 100644 --- a/internal/ackhandler/sent_packet_history.go +++ b/internal/ackhandler/sent_packet_history.go @@ -3,7 +3,7 @@ package ackhandler import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) type sentPacketHistory struct { diff --git a/internal/ackhandler/sent_packet_history_test.go b/internal/ackhandler/sent_packet_history_test.go index 0f05b63e..4a9f6435 100644 --- a/internal/ackhandler/sent_packet_history_test.go +++ b/internal/ackhandler/sent_packet_history_test.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/ackhandler/u_ackhandler.go b/internal/ackhandler/u_ackhandler.go index 56886795..8d590390 100644 --- a/internal/ackhandler/u_ackhandler.go +++ b/internal/ackhandler/u_ackhandler.go @@ -1,9 +1,9 @@ package ackhandler import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) // [UQUIC] diff --git a/internal/ackhandler/u_sent_packet_handler.go b/internal/ackhandler/u_sent_packet_handler.go index 1e1dfcd3..048c1ffe 100644 --- a/internal/ackhandler/u_sent_packet_handler.go +++ b/internal/ackhandler/u_sent_packet_handler.go @@ -1,6 +1,6 @@ package ackhandler -import "github.com/quic-go/quic-go/internal/protocol" +import "github.com/refraction-networking/uquic/internal/protocol" type uSentPacketHandler struct { *sentPacketHandler diff --git a/internal/congestion/bandwidth.go b/internal/congestion/bandwidth.go index 1d03abbb..fb18af41 100644 --- a/internal/congestion/bandwidth.go +++ b/internal/congestion/bandwidth.go @@ -4,7 +4,7 @@ import ( "math" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // Bandwidth of a connection diff --git a/internal/congestion/cubic.go b/internal/congestion/cubic.go index a73cf82a..df18b7be 100644 --- a/internal/congestion/cubic.go +++ b/internal/congestion/cubic.go @@ -4,8 +4,8 @@ import ( "math" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // This cubic implementation is based on the one found in Chromiums's QUIC diff --git a/internal/congestion/cubic_sender.go b/internal/congestion/cubic_sender.go index 2e508475..2e6895bf 100644 --- a/internal/congestion/cubic_sender.go +++ b/internal/congestion/cubic_sender.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) const ( diff --git a/internal/congestion/cubic_sender_test.go b/internal/congestion/cubic_sender_test.go index 85d81167..01f008b1 100644 --- a/internal/congestion/cubic_sender_test.go +++ b/internal/congestion/cubic_sender_test.go @@ -3,8 +3,8 @@ package congestion import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/congestion/cubic_test.go b/internal/congestion/cubic_test.go index c1ad621d..1cabce15 100644 --- a/internal/congestion/cubic_test.go +++ b/internal/congestion/cubic_test.go @@ -4,7 +4,7 @@ import ( "math" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/congestion/hybrid_slow_start.go b/internal/congestion/hybrid_slow_start.go index b2f7c908..ae190971 100644 --- a/internal/congestion/hybrid_slow_start.go +++ b/internal/congestion/hybrid_slow_start.go @@ -3,8 +3,8 @@ package congestion import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // Note(pwestin): the magic clamping numbers come from the original code in diff --git a/internal/congestion/hybrid_slow_start_test.go b/internal/congestion/hybrid_slow_start_test.go index 5d951799..f6a901c0 100644 --- a/internal/congestion/hybrid_slow_start_test.go +++ b/internal/congestion/hybrid_slow_start_test.go @@ -3,7 +3,7 @@ package congestion import ( "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/congestion/interface.go b/internal/congestion/interface.go index 484bd5f8..1cefb7c5 100644 --- a/internal/congestion/interface.go +++ b/internal/congestion/interface.go @@ -3,7 +3,7 @@ package congestion import ( "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A SendAlgorithm performs congestion control diff --git a/internal/congestion/pacer.go b/internal/congestion/pacer.go index 09ea2680..3b433404 100644 --- a/internal/congestion/pacer.go +++ b/internal/congestion/pacer.go @@ -4,8 +4,8 @@ import ( "math" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) const maxBurstSizePackets = 10 diff --git a/internal/congestion/pacer_test.go b/internal/congestion/pacer_test.go index 69f58fcc..9843dab1 100644 --- a/internal/congestion/pacer_test.go +++ b/internal/congestion/pacer_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/flowcontrol/base_flow_controller.go b/internal/flowcontrol/base_flow_controller.go index f3f24a60..537c8dae 100644 --- a/internal/flowcontrol/base_flow_controller.go +++ b/internal/flowcontrol/base_flow_controller.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) type baseFlowController struct { diff --git a/internal/flowcontrol/base_flow_controller_test.go b/internal/flowcontrol/base_flow_controller_test.go index 6c26e7f8..db22b88b 100644 --- a/internal/flowcontrol/base_flow_controller_test.go +++ b/internal/flowcontrol/base_flow_controller_test.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/flowcontrol/connection_flow_controller.go b/internal/flowcontrol/connection_flow_controller.go index 13e69d6c..980cbc59 100644 --- a/internal/flowcontrol/connection_flow_controller.go +++ b/internal/flowcontrol/connection_flow_controller.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" ) type connectionFlowController struct { diff --git a/internal/flowcontrol/connection_flow_controller_test.go b/internal/flowcontrol/connection_flow_controller_test.go index 8be70eef..c84ea8cf 100644 --- a/internal/flowcontrol/connection_flow_controller_test.go +++ b/internal/flowcontrol/connection_flow_controller_test.go @@ -3,8 +3,8 @@ package flowcontrol import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/flowcontrol/interface.go b/internal/flowcontrol/interface.go index 946519d5..b1a5d59e 100644 --- a/internal/flowcontrol/interface.go +++ b/internal/flowcontrol/interface.go @@ -1,6 +1,6 @@ package flowcontrol -import "github.com/quic-go/quic-go/internal/protocol" +import "github.com/refraction-networking/uquic/internal/protocol" type flowController interface { // for sending diff --git a/internal/flowcontrol/stream_flow_controller.go b/internal/flowcontrol/stream_flow_controller.go index 1770a9c8..7db48740 100644 --- a/internal/flowcontrol/stream_flow_controller.go +++ b/internal/flowcontrol/stream_flow_controller.go @@ -3,9 +3,9 @@ package flowcontrol import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" ) type streamFlowController struct { diff --git a/internal/flowcontrol/stream_flow_controller_test.go b/internal/flowcontrol/stream_flow_controller_test.go index c8c3835c..e5e08f81 100644 --- a/internal/flowcontrol/stream_flow_controller_test.go +++ b/internal/flowcontrol/stream_flow_controller_test.go @@ -3,9 +3,9 @@ package flowcontrol import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/aead.go b/internal/handshake/aead.go index 6aa89fb3..6d88bfda 100644 --- a/internal/handshake/aead.go +++ b/internal/handshake/aead.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "encoding/binary" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) func createAEAD(suite *cipherSuite, trafficSecret []byte, v protocol.VersionNumber) cipher.AEAD { diff --git a/internal/handshake/aead_test.go b/internal/handshake/aead_test.go index 8dd05ab3..f9cf6497 100644 --- a/internal/handshake/aead_test.go +++ b/internal/handshake/aead_test.go @@ -9,7 +9,7 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/crypto_setup.go b/internal/handshake/crypto_setup.go index 46d3454a..e268a382 100644 --- a/internal/handshake/crypto_setup.go +++ b/internal/handshake/crypto_setup.go @@ -12,13 +12,13 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/qtls" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/qtls" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" + "github.com/refraction-networking/uquic/quicvarint" ) type quicVersionContextKey struct{} diff --git a/internal/handshake/crypto_setup_test.go b/internal/handshake/crypto_setup_test.go index 415f003a..ffdd832f 100644 --- a/internal/handshake/crypto_setup_test.go +++ b/internal/handshake/crypto_setup_test.go @@ -11,12 +11,12 @@ import ( tls "github.com/refraction-networking/utls" - mocktls "github.com/quic-go/quic-go/internal/mocks/tls" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + mocktls "github.com/refraction-networking/uquic/internal/mocks/tls" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" diff --git a/internal/handshake/header_protector.go b/internal/handshake/header_protector.go index 070b5b33..21def713 100644 --- a/internal/handshake/header_protector.go +++ b/internal/handshake/header_protector.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/chacha20" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) type headerProtector interface { diff --git a/internal/handshake/initial_aead.go b/internal/handshake/initial_aead.go index 63b4a257..dbeef89f 100644 --- a/internal/handshake/initial_aead.go +++ b/internal/handshake/initial_aead.go @@ -7,7 +7,7 @@ import ( "golang.org/x/crypto/hkdf" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) var ( diff --git a/internal/handshake/initial_aead_test.go b/internal/handshake/initial_aead_test.go index 6cd840de..5715dd4d 100644 --- a/internal/handshake/initial_aead_test.go +++ b/internal/handshake/initial_aead_test.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "fmt" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/interface.go b/internal/handshake/interface.go index 60058911..60ccf11d 100644 --- a/internal/handshake/interface.go +++ b/internal/handshake/interface.go @@ -7,8 +7,8 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) var ( diff --git a/internal/handshake/retry.go b/internal/handshake/retry.go index 68fa53ed..aa8f92d8 100644 --- a/internal/handshake/retry.go +++ b/internal/handshake/retry.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) var ( diff --git a/internal/handshake/retry_test.go b/internal/handshake/retry_test.go index 560e7af5..98d80b01 100644 --- a/internal/handshake/retry_test.go +++ b/internal/handshake/retry_test.go @@ -3,7 +3,7 @@ package handshake import ( "encoding/binary" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/session_ticket.go b/internal/handshake/session_ticket.go index d3efeb29..5f5421b5 100644 --- a/internal/handshake/session_ticket.go +++ b/internal/handshake/session_ticket.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/quicvarint" ) const sessionTicketRevision = 3 diff --git a/internal/handshake/session_ticket_test.go b/internal/handshake/session_ticket_test.go index 67e33b22..a113f024 100644 --- a/internal/handshake/session_ticket_test.go +++ b/internal/handshake/session_ticket_test.go @@ -3,8 +3,8 @@ package handshake import ( "time" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/token_generator.go b/internal/handshake/token_generator.go index e5e90bb3..aaff9400 100644 --- a/internal/handshake/token_generator.go +++ b/internal/handshake/token_generator.go @@ -8,7 +8,7 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) const ( diff --git a/internal/handshake/token_generator_test.go b/internal/handshake/token_generator_test.go index 870ba3ed..50fa0545 100644 --- a/internal/handshake/token_generator_test.go +++ b/internal/handshake/token_generator_test.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/handshake/u_crypto_setup.go b/internal/handshake/u_crypto_setup.go index 38488ddd..62c6ae40 100644 --- a/internal/handshake/u_crypto_setup.go +++ b/internal/handshake/u_crypto_setup.go @@ -1,11 +1,11 @@ package handshake import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qtls" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qtls" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" tls "github.com/refraction-networking/utls" ) diff --git a/internal/handshake/updatable_aead.go b/internal/handshake/updatable_aead.go index 643cd498..a34beb4b 100644 --- a/internal/handshake/updatable_aead.go +++ b/internal/handshake/updatable_aead.go @@ -9,10 +9,10 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) // KeyUpdateInterval is the maximum number of packets we send or receive before initiating a key update. diff --git a/internal/handshake/updatable_aead_test.go b/internal/handshake/updatable_aead_test.go index 02c444aa..4072d6dd 100644 --- a/internal/handshake/updatable_aead_test.go +++ b/internal/handshake/updatable_aead_test.go @@ -8,10 +8,10 @@ import ( tls "github.com/refraction-networking/utls" - mocklogging "github.com/quic-go/quic-go/internal/mocks/logging" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" + mocklogging "github.com/refraction-networking/uquic/internal/mocks/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/logutils/frame.go b/internal/logutils/frame.go index a6032fc2..3cfd281c 100644 --- a/internal/logutils/frame.go +++ b/internal/logutils/frame.go @@ -1,9 +1,9 @@ package logutils import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" ) // ConvertFrame converts a wire.Frame into a logging.Frame. diff --git a/internal/logutils/frame_test.go b/internal/logutils/frame_test.go index 6db71561..2c0b08c5 100644 --- a/internal/logutils/frame_test.go +++ b/internal/logutils/frame_test.go @@ -1,8 +1,8 @@ package logutils import ( - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/mocks/ackhandler/received_packet_handler.go b/internal/mocks/ackhandler/received_packet_handler.go index c73727e0..a368b364 100644 --- a/internal/mocks/ackhandler/received_packet_handler.go +++ b/internal/mocks/ackhandler/received_packet_handler.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/ackhandler (interfaces: ReceivedPacketHandler) +// Source: github.com/refraction-networking/uquic/internal/ackhandler (interfaces: ReceivedPacketHandler) // Package mockackhandler is a generated GoMock package. package mockackhandler @@ -9,8 +9,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockReceivedPacketHandler is a mock of ReceivedPacketHandler interface. diff --git a/internal/mocks/ackhandler/sent_packet_handler.go b/internal/mocks/ackhandler/sent_packet_handler.go index 0904d5cb..76db968c 100644 --- a/internal/mocks/ackhandler/sent_packet_handler.go +++ b/internal/mocks/ackhandler/sent_packet_handler.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/ackhandler (interfaces: SentPacketHandler) +// Source: github.com/refraction-networking/uquic/internal/ackhandler (interfaces: SentPacketHandler) // Package mockackhandler is a generated GoMock package. package mockackhandler @@ -9,9 +9,9 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockSentPacketHandler is a mock of SentPacketHandler interface. diff --git a/internal/mocks/congestion.go b/internal/mocks/congestion.go index 6a5e46ad..c81b7177 100644 --- a/internal/mocks/congestion.go +++ b/internal/mocks/congestion.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/congestion (interfaces: SendAlgorithmWithDebugInfos) +// Source: github.com/refraction-networking/uquic/internal/congestion (interfaces: SendAlgorithmWithDebugInfos) // Package mocks is a generated GoMock package. package mocks @@ -9,7 +9,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockSendAlgorithmWithDebugInfos is a mock of SendAlgorithmWithDebugInfos interface. diff --git a/internal/mocks/connection_flow_controller.go b/internal/mocks/connection_flow_controller.go index a0c252f3..02d3c3a1 100644 --- a/internal/mocks/connection_flow_controller.go +++ b/internal/mocks/connection_flow_controller.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/flowcontrol (interfaces: ConnectionFlowController) +// Source: github.com/refraction-networking/uquic/internal/flowcontrol (interfaces: ConnectionFlowController) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockConnectionFlowController is a mock of ConnectionFlowController interface. diff --git a/internal/mocks/crypto_setup.go b/internal/mocks/crypto_setup.go index 1c707b9c..61a019a6 100644 --- a/internal/mocks/crypto_setup.go +++ b/internal/mocks/crypto_setup.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/handshake (interfaces: CryptoSetup) +// Source: github.com/refraction-networking/uquic/internal/handshake (interfaces: CryptoSetup) // Package mocks is a generated GoMock package. package mocks @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - handshake "github.com/quic-go/quic-go/internal/handshake" - protocol "github.com/quic-go/quic-go/internal/protocol" + handshake "github.com/refraction-networking/uquic/internal/handshake" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockCryptoSetup is a mock of CryptoSetup interface. diff --git a/internal/mocks/logging/connection_tracer.go b/internal/mocks/logging/connection_tracer.go index 2a7d2f13..e03a5897 100644 --- a/internal/mocks/logging/connection_tracer.go +++ b/internal/mocks/logging/connection_tracer.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/logging (interfaces: ConnectionTracer) +// Source: github.com/refraction-networking/uquic/logging (interfaces: ConnectionTracer) // Package mocklogging is a generated GoMock package. package mocklogging @@ -10,10 +10,10 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - utils "github.com/quic-go/quic-go/internal/utils" - wire "github.com/quic-go/quic-go/internal/wire" - logging "github.com/quic-go/quic-go/logging" + protocol "github.com/refraction-networking/uquic/internal/protocol" + utils "github.com/refraction-networking/uquic/internal/utils" + wire "github.com/refraction-networking/uquic/internal/wire" + logging "github.com/refraction-networking/uquic/logging" ) // MockConnectionTracer is a mock of ConnectionTracer interface. diff --git a/internal/mocks/logging/tracer.go b/internal/mocks/logging/tracer.go index 56741ef2..42f81660 100644 --- a/internal/mocks/logging/tracer.go +++ b/internal/mocks/logging/tracer.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/logging (interfaces: Tracer) +// Source: github.com/refraction-networking/uquic/logging (interfaces: Tracer) // Package mocklogging is a generated GoMock package. package mocklogging @@ -9,9 +9,9 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" - logging "github.com/quic-go/quic-go/logging" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" + logging "github.com/refraction-networking/uquic/logging" ) // MockTracer is a mock of Tracer interface. diff --git a/internal/mocks/long_header_opener.go b/internal/mocks/long_header_opener.go index cb4970d1..61d55f27 100644 --- a/internal/mocks/long_header_opener.go +++ b/internal/mocks/long_header_opener.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/handshake (interfaces: LongHeaderOpener) +// Source: github.com/refraction-networking/uquic/internal/handshake (interfaces: LongHeaderOpener) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockLongHeaderOpener is a mock of LongHeaderOpener interface. diff --git a/internal/mocks/mockgen.go b/internal/mocks/mockgen.go index 8717fce0..6f68d26c 100644 --- a/internal/mocks/mockgen.go +++ b/internal/mocks/mockgen.go @@ -1,18 +1,18 @@ package mocks -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockquic -destination quic/stream.go github.com/quic-go/quic-go Stream" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockquic -destination quic/early_conn_tmp.go github.com/quic-go/quic-go EarlyConnection && sed 's/qtls.ConnectionState/quic.ConnectionState/g' quic/early_conn_tmp.go > quic/early_conn.go && rm quic/early_conn_tmp.go && go run golang.org/x/tools/cmd/goimports -w quic/early_conn.go" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocklogging -destination logging/tracer.go github.com/quic-go/quic-go/logging Tracer" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocklogging -destination logging/connection_tracer.go github.com/quic-go/quic-go/logging ConnectionTracer" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination short_header_sealer.go github.com/quic-go/quic-go/internal/handshake ShortHeaderSealer" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination short_header_opener.go github.com/quic-go/quic-go/internal/handshake ShortHeaderOpener" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination long_header_opener.go github.com/quic-go/quic-go/internal/handshake LongHeaderOpener" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination crypto_setup_tmp.go github.com/quic-go/quic-go/internal/handshake CryptoSetup && sed -E 's~github.com/quic-go/qtls[[:alnum:]_-]*~github.com/quic-go/quic-go/internal/qtls~g; s~qtls.ConnectionStateWith0RTT~qtls.ConnectionState~g' crypto_setup_tmp.go > crypto_setup.go && rm crypto_setup_tmp.go && go run golang.org/x/tools/cmd/goimports -w crypto_setup.go" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination stream_flow_controller.go github.com/quic-go/quic-go/internal/flowcontrol StreamFlowController" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination congestion.go github.com/quic-go/quic-go/internal/congestion SendAlgorithmWithDebugInfos" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination connection_flow_controller.go github.com/quic-go/quic-go/internal/flowcontrol ConnectionFlowController" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockackhandler -destination ackhandler/sent_packet_handler.go github.com/quic-go/quic-go/internal/ackhandler SentPacketHandler" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockackhandler -destination ackhandler/received_packet_handler.go github.com/quic-go/quic-go/internal/ackhandler ReceivedPacketHandler" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockquic -destination quic/stream.go github.com/refraction-networking/uquic Stream" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockquic -destination quic/early_conn_tmp.go github.com/refraction-networking/uquic EarlyConnection && sed 's/qtls.ConnectionState/quic.ConnectionState/g' quic/early_conn_tmp.go > quic/early_conn.go && rm quic/early_conn_tmp.go && go run golang.org/x/tools/cmd/goimports -w quic/early_conn.go" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocklogging -destination logging/tracer.go github.com/refraction-networking/uquic/logging Tracer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocklogging -destination logging/connection_tracer.go github.com/refraction-networking/uquic/logging ConnectionTracer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination short_header_sealer.go github.com/refraction-networking/uquic/internal/handshake ShortHeaderSealer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination short_header_opener.go github.com/refraction-networking/uquic/internal/handshake ShortHeaderOpener" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination long_header_opener.go github.com/refraction-networking/uquic/internal/handshake LongHeaderOpener" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination crypto_setup_tmp.go github.com/refraction-networking/uquic/internal/handshake CryptoSetup && sed -E 's~github.com/quic-go/qtls[[:alnum:]_-]*~github.com/refraction-networking/uquic/internal/qtls~g; s~qtls.ConnectionStateWith0RTT~qtls.ConnectionState~g' crypto_setup_tmp.go > crypto_setup.go && rm crypto_setup_tmp.go && go run golang.org/x/tools/cmd/goimports -w crypto_setup.go" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination stream_flow_controller.go github.com/refraction-networking/uquic/internal/flowcontrol StreamFlowController" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination congestion.go github.com/refraction-networking/uquic/internal/congestion SendAlgorithmWithDebugInfos" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mocks -destination connection_flow_controller.go github.com/refraction-networking/uquic/internal/flowcontrol ConnectionFlowController" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockackhandler -destination ackhandler/sent_packet_handler.go github.com/refraction-networking/uquic/internal/ackhandler SentPacketHandler" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package mockackhandler -destination ackhandler/received_packet_handler.go github.com/refraction-networking/uquic/internal/ackhandler ReceivedPacketHandler" // The following command produces a warning message on OSX, however, it still generates the correct mock file. // See https://github.com/golang/mock/issues/339 for details. diff --git a/internal/mocks/quic/early_conn.go b/internal/mocks/quic/early_conn.go index a573e06f..816ca5a3 100644 --- a/internal/mocks/quic/early_conn.go +++ b/internal/mocks/quic/early_conn.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: EarlyConnection) +// Source: github.com/refraction-networking/uquic (interfaces: EarlyConnection) // Package mockquic is a generated GoMock package. package mockquic @@ -10,8 +10,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - quic "github.com/quic-go/quic-go" - qerr "github.com/quic-go/quic-go/internal/qerr" + quic "github.com/refraction-networking/uquic" + qerr "github.com/refraction-networking/uquic/internal/qerr" ) // MockEarlyConnection is a mock of EarlyConnection interface. diff --git a/internal/mocks/quic/stream.go b/internal/mocks/quic/stream.go index 1221ac3b..c548883b 100644 --- a/internal/mocks/quic/stream.go +++ b/internal/mocks/quic/stream.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: Stream) +// Source: github.com/refraction-networking/uquic (interfaces: Stream) // Package mockquic is a generated GoMock package. package mockquic @@ -10,8 +10,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" ) // MockStream is a mock of Stream interface. diff --git a/internal/mocks/short_header_opener.go b/internal/mocks/short_header_opener.go index 47e858cb..c4ab76de 100644 --- a/internal/mocks/short_header_opener.go +++ b/internal/mocks/short_header_opener.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/handshake (interfaces: ShortHeaderOpener) +// Source: github.com/refraction-networking/uquic/internal/handshake (interfaces: ShortHeaderOpener) // Package mocks is a generated GoMock package. package mocks @@ -9,7 +9,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockShortHeaderOpener is a mock of ShortHeaderOpener interface. diff --git a/internal/mocks/short_header_sealer.go b/internal/mocks/short_header_sealer.go index 666fd8fb..90f4b80f 100644 --- a/internal/mocks/short_header_sealer.go +++ b/internal/mocks/short_header_sealer.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/handshake (interfaces: ShortHeaderSealer) +// Source: github.com/refraction-networking/uquic/internal/handshake (interfaces: ShortHeaderSealer) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockShortHeaderSealer is a mock of ShortHeaderSealer interface. diff --git a/internal/mocks/stream_flow_controller.go b/internal/mocks/stream_flow_controller.go index 9d730eba..ab6dcade 100644 --- a/internal/mocks/stream_flow_controller.go +++ b/internal/mocks/stream_flow_controller.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/internal/flowcontrol (interfaces: StreamFlowController) +// Source: github.com/refraction-networking/uquic/internal/flowcontrol (interfaces: StreamFlowController) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockStreamFlowController is a mock of StreamFlowController interface. diff --git a/internal/qerr/error_codes.go b/internal/qerr/error_codes.go index a037acd2..b8e84fc0 100644 --- a/internal/qerr/error_codes.go +++ b/internal/qerr/error_codes.go @@ -3,7 +3,7 @@ package qerr import ( "fmt" - "github.com/quic-go/quic-go/internal/qtls" + "github.com/refraction-networking/uquic/internal/qtls" ) // TransportErrorCode is a QUIC transport error. diff --git a/internal/qerr/errors.go b/internal/qerr/errors.go index 26ea3445..4a053ae0 100644 --- a/internal/qerr/errors.go +++ b/internal/qerr/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) var ( diff --git a/internal/qerr/errors_test.go b/internal/qerr/errors_test.go index 52d5c9e9..cfad6156 100644 --- a/internal/qerr/errors_test.go +++ b/internal/qerr/errors_test.go @@ -4,7 +4,7 @@ import ( "errors" "net" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/qtls/cipher_suite_test.go b/internal/qtls/cipher_suite_test.go index 91eb9984..aedcbcdc 100644 --- a/internal/qtls/cipher_suite_test.go +++ b/internal/qtls/cipher_suite_test.go @@ -6,7 +6,7 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/testdata" + "github.com/refraction-networking/uquic/internal/testdata" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/qtls/client_session_cache_test.go b/internal/qtls/client_session_cache_test.go index fc32f42d..7bacebe2 100644 --- a/internal/qtls/client_session_cache_test.go +++ b/internal/qtls/client_session_cache_test.go @@ -6,7 +6,7 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/testdata" + "github.com/refraction-networking/uquic/internal/testdata" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/qtls/go_oldversion.go b/internal/qtls/go_oldversion.go index 0fca80a3..2903587e 100644 --- a/internal/qtls/go_oldversion.go +++ b/internal/qtls/go_oldversion.go @@ -2,4 +2,4 @@ package qtls -var _ int = "The version of quic-go you're using can't be built using outdated Go versions. For more details, please see https://github.com/quic-go/quic-go/wiki/quic-go-and-Go-versions." +var _ int = "The version of quic-go you're using can't be built using outdated Go versions. For more details, please see https://github.com/refraction-networking/uquic/wiki/quic-go-and-Go-versions." diff --git a/internal/qtls/utls.go b/internal/qtls/utls.go index 91a1b2ec..34b71f1c 100644 --- a/internal/qtls/utls.go +++ b/internal/qtls/utls.go @@ -6,7 +6,7 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) type ( diff --git a/internal/qtls/utls_test.go b/internal/qtls/utls_test.go index 03d615c6..31dda063 100644 --- a/internal/qtls/utls_test.go +++ b/internal/qtls/utls_test.go @@ -3,7 +3,7 @@ package qtls import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go index ab322093..45e8c422 100644 --- a/internal/testutils/testutils.go +++ b/internal/testutils/testutils.go @@ -3,9 +3,9 @@ package testutils import ( "fmt" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) // Utilities for simulating packet injection and man-in-the-middle (MITM) attacker tests. diff --git a/internal/utils/log.go b/internal/utils/log.go index 89b52c0d..4f4c2651 100644 --- a/internal/utils/log.go +++ b/internal/utils/log.go @@ -125,7 +125,7 @@ func readLoggingEnv() LogLevel { case "error": return LogLevelError default: - fmt.Fprintln(os.Stderr, "invalid quic-go log level, see https://github.com/quic-go/quic-go/wiki/Logging") + fmt.Fprintln(os.Stderr, "invalid quic-go log level, see https://github.com/refraction-networking/uquic/wiki/Logging") return LogLevelNothing } } diff --git a/internal/utils/ringbuffer/ringbuffer.go b/internal/utils/ringbuffer/ringbuffer.go index 81a5ad44..eae261f1 100644 --- a/internal/utils/ringbuffer/ringbuffer.go +++ b/internal/utils/ringbuffer/ringbuffer.go @@ -50,7 +50,7 @@ func (r *RingBuffer[T]) PushBack(t T) { // callers might need to check if there are elements in the buffer first. func (r *RingBuffer[T]) PopFront() T { if r.Empty() { - panic("github.com/quic-go/quic-go/internal/utils/ringbuffer: pop from an empty queue") + panic("github.com/refraction-networking/uquic/internal/utils/ringbuffer: pop from an empty queue") } r.full = false t := r.ring[r.headPos] diff --git a/internal/utils/rtt_stats.go b/internal/utils/rtt_stats.go index 2cd9a191..4e867ca7 100644 --- a/internal/utils/rtt_stats.go +++ b/internal/utils/rtt_stats.go @@ -3,7 +3,7 @@ package utils import ( "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) const ( diff --git a/internal/utils/rtt_stats_test.go b/internal/utils/rtt_stats_test.go index eae31926..4a8155a3 100644 --- a/internal/utils/rtt_stats_test.go +++ b/internal/utils/rtt_stats_test.go @@ -3,7 +3,7 @@ package utils import ( "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/ack_frame.go b/internal/wire/ack_frame.go index 9b23cc25..b6831916 100644 --- a/internal/wire/ack_frame.go +++ b/internal/wire/ack_frame.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" ) var errInvalidAckRanges = errors.New("AckFrame: ACK frame contains invalid ACK ranges") diff --git a/internal/wire/ack_frame_test.go b/internal/wire/ack_frame_test.go index c94c157d..27974cf1 100644 --- a/internal/wire/ack_frame_test.go +++ b/internal/wire/ack_frame_test.go @@ -6,8 +6,8 @@ import ( "math" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/ack_range.go b/internal/wire/ack_range.go index 03a1235e..813d4ee5 100644 --- a/internal/wire/ack_range.go +++ b/internal/wire/ack_range.go @@ -1,6 +1,6 @@ package wire -import "github.com/quic-go/quic-go/internal/protocol" +import "github.com/refraction-networking/uquic/internal/protocol" // AckRange is an ACK range type AckRange struct { diff --git a/internal/wire/connection_close_frame.go b/internal/wire/connection_close_frame.go index f56c2c0d..7a0b4db5 100644 --- a/internal/wire/connection_close_frame.go +++ b/internal/wire/connection_close_frame.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A ConnectionCloseFrame is a CONNECTION_CLOSE frame diff --git a/internal/wire/connection_close_frame_test.go b/internal/wire/connection_close_frame_test.go index 0b36c1f7..57d9e983 100644 --- a/internal/wire/connection_close_frame_test.go +++ b/internal/wire/connection_close_frame_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/crypto_frame.go b/internal/wire/crypto_frame.go index 0f005c5b..c6e08234 100644 --- a/internal/wire/crypto_frame.go +++ b/internal/wire/crypto_frame.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A CryptoFrame is a CRYPTO frame diff --git a/internal/wire/crypto_frame_test.go b/internal/wire/crypto_frame_test.go index fb683c37..b0042261 100644 --- a/internal/wire/crypto_frame_test.go +++ b/internal/wire/crypto_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/data_blocked_frame.go b/internal/wire/data_blocked_frame.go index 0d4d1f56..d3eb0fa7 100644 --- a/internal/wire/data_blocked_frame.go +++ b/internal/wire/data_blocked_frame.go @@ -3,8 +3,8 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A DataBlockedFrame is a DATA_BLOCKED frame diff --git a/internal/wire/data_blocked_frame_test.go b/internal/wire/data_blocked_frame_test.go index 83c25040..4dbcd69b 100644 --- a/internal/wire/data_blocked_frame_test.go +++ b/internal/wire/data_blocked_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/datagram_frame.go b/internal/wire/datagram_frame.go index e6c45196..be9bd72d 100644 --- a/internal/wire/datagram_frame.go +++ b/internal/wire/datagram_frame.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A DatagramFrame is a DATAGRAM frame diff --git a/internal/wire/datagram_frame_test.go b/internal/wire/datagram_frame_test.go index 63c914c6..ca8ac6df 100644 --- a/internal/wire/datagram_frame_test.go +++ b/internal/wire/datagram_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/extended_header.go b/internal/wire/extended_header.go index d10820d6..31ef6989 100644 --- a/internal/wire/extended_header.go +++ b/internal/wire/extended_header.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" ) // ErrInvalidReservedBits is returned when the reserved bits are incorrect. diff --git a/internal/wire/extended_header_test.go b/internal/wire/extended_header_test.go index 23a25233..f6486c7a 100644 --- a/internal/wire/extended_header_test.go +++ b/internal/wire/extended_header_test.go @@ -5,9 +5,9 @@ import ( "log" "os" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/frame_parser.go b/internal/wire/frame_parser.go index ff35dd10..c0ad6ca5 100644 --- a/internal/wire/frame_parser.go +++ b/internal/wire/frame_parser.go @@ -6,9 +6,9 @@ import ( "fmt" "reflect" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" ) const ( diff --git a/internal/wire/frame_parser_test.go b/internal/wire/frame_parser_test.go index 88079ff0..06f3cf0c 100644 --- a/internal/wire/frame_parser_test.go +++ b/internal/wire/frame_parser_test.go @@ -3,8 +3,8 @@ package wire import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/handshake_done_frame.go b/internal/wire/handshake_done_frame.go index 29521bc9..19431808 100644 --- a/internal/wire/handshake_done_frame.go +++ b/internal/wire/handshake_done_frame.go @@ -1,7 +1,7 @@ package wire import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A HandshakeDoneFrame is a HANDSHAKE_DONE frame diff --git a/internal/wire/handshake_done_frame_test.go b/internal/wire/handshake_done_frame_test.go index ee058414..342d5ab6 100644 --- a/internal/wire/handshake_done_frame_test.go +++ b/internal/wire/handshake_done_frame_test.go @@ -1,7 +1,7 @@ package wire import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/header.go b/internal/wire/header.go index e2dc72e4..4060d598 100644 --- a/internal/wire/header.go +++ b/internal/wire/header.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" ) // ParseConnectionID parses the destination connection ID of a packet. diff --git a/internal/wire/header_test.go b/internal/wire/header_test.go index bf083c3f..f5b28d54 100644 --- a/internal/wire/header_test.go +++ b/internal/wire/header_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/interface.go b/internal/wire/interface.go index 7e0f9a03..ca84d4fa 100644 --- a/internal/wire/interface.go +++ b/internal/wire/interface.go @@ -1,7 +1,7 @@ package wire import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A Frame in QUIC diff --git a/internal/wire/log.go b/internal/wire/log.go index ec7d45d8..bf1a8d3b 100644 --- a/internal/wire/log.go +++ b/internal/wire/log.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // LogFrame logs a frame, either sent or received diff --git a/internal/wire/log_test.go b/internal/wire/log_test.go index 8675cb71..ddf9461e 100644 --- a/internal/wire/log_test.go +++ b/internal/wire/log_test.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/max_data_frame.go b/internal/wire/max_data_frame.go index e61b0f9f..7ddb40a9 100644 --- a/internal/wire/max_data_frame.go +++ b/internal/wire/max_data_frame.go @@ -3,8 +3,8 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A MaxDataFrame carries flow control information for the connection diff --git a/internal/wire/max_data_frame_test.go b/internal/wire/max_data_frame_test.go index c1f09119..dabf19f1 100644 --- a/internal/wire/max_data_frame_test.go +++ b/internal/wire/max_data_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/max_stream_data_frame.go b/internal/wire/max_stream_data_frame.go index fe3d1e3f..33a156b7 100644 --- a/internal/wire/max_stream_data_frame.go +++ b/internal/wire/max_stream_data_frame.go @@ -3,8 +3,8 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A MaxStreamDataFrame is a MAX_STREAM_DATA frame diff --git a/internal/wire/max_stream_data_frame_test.go b/internal/wire/max_stream_data_frame_test.go index b87a919a..45cb63ec 100644 --- a/internal/wire/max_stream_data_frame_test.go +++ b/internal/wire/max_stream_data_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/max_streams_frame.go b/internal/wire/max_streams_frame.go index bd278c02..b80591bb 100644 --- a/internal/wire/max_streams_frame.go +++ b/internal/wire/max_streams_frame.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A MaxStreamsFrame is a MAX_STREAMS frame diff --git a/internal/wire/max_streams_frame_test.go b/internal/wire/max_streams_frame_test.go index 47a5d446..32dc2f13 100644 --- a/internal/wire/max_streams_frame_test.go +++ b/internal/wire/max_streams_frame_test.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/new_connection_id_frame.go b/internal/wire/new_connection_id_frame.go index 83102d5d..37c9577a 100644 --- a/internal/wire/new_connection_id_frame.go +++ b/internal/wire/new_connection_id_frame.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A NewConnectionIDFrame is a NEW_CONNECTION_ID frame diff --git a/internal/wire/new_connection_id_frame_test.go b/internal/wire/new_connection_id_frame_test.go index 4628aaf2..f4da8314 100644 --- a/internal/wire/new_connection_id_frame_test.go +++ b/internal/wire/new_connection_id_frame_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/new_token_frame.go b/internal/wire/new_token_frame.go index c3fa178c..34c62b98 100644 --- a/internal/wire/new_token_frame.go +++ b/internal/wire/new_token_frame.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A NewTokenFrame is a NEW_TOKEN frame diff --git a/internal/wire/new_token_frame_test.go b/internal/wire/new_token_frame_test.go index c991a6bb..f5b91e87 100644 --- a/internal/wire/new_token_frame_test.go +++ b/internal/wire/new_token_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/path_challenge_frame.go b/internal/wire/path_challenge_frame.go index ad024330..de2e7ad9 100644 --- a/internal/wire/path_challenge_frame.go +++ b/internal/wire/path_challenge_frame.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A PathChallengeFrame is a PATH_CHALLENGE frame diff --git a/internal/wire/path_challenge_frame_test.go b/internal/wire/path_challenge_frame_test.go index 0f15a417..c456aeb7 100644 --- a/internal/wire/path_challenge_frame_test.go +++ b/internal/wire/path_challenge_frame_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/path_response_frame.go b/internal/wire/path_response_frame.go index 76e65104..9dd69c25 100644 --- a/internal/wire/path_response_frame.go +++ b/internal/wire/path_response_frame.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A PathResponseFrame is a PATH_RESPONSE frame diff --git a/internal/wire/path_response_frame_test.go b/internal/wire/path_response_frame_test.go index 48e17742..48e5d3c8 100644 --- a/internal/wire/path_response_frame_test.go +++ b/internal/wire/path_response_frame_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/ping_frame.go b/internal/wire/ping_frame.go index dd24edc0..a616f7d0 100644 --- a/internal/wire/ping_frame.go +++ b/internal/wire/ping_frame.go @@ -1,7 +1,7 @@ package wire import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A PingFrame is a PING frame diff --git a/internal/wire/ping_frame_test.go b/internal/wire/ping_frame_test.go index 8f8fb5d9..b12eabeb 100644 --- a/internal/wire/ping_frame_test.go +++ b/internal/wire/ping_frame_test.go @@ -1,7 +1,7 @@ package wire import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/pool.go b/internal/wire/pool.go index 18ab4379..7eec87e1 100644 --- a/internal/wire/pool.go +++ b/internal/wire/pool.go @@ -3,7 +3,7 @@ package wire import ( "sync" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) var pool sync.Pool diff --git a/internal/wire/reset_stream_frame.go b/internal/wire/reset_stream_frame.go index cd94c940..bfa27239 100644 --- a/internal/wire/reset_stream_frame.go +++ b/internal/wire/reset_stream_frame.go @@ -3,9 +3,9 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" ) // A ResetStreamFrame is a RESET_STREAM frame in QUIC diff --git a/internal/wire/reset_stream_frame_test.go b/internal/wire/reset_stream_frame_test.go index 3f254d13..0be87bc2 100644 --- a/internal/wire/reset_stream_frame_test.go +++ b/internal/wire/reset_stream_frame_test.go @@ -3,9 +3,9 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/retire_connection_id_frame.go b/internal/wire/retire_connection_id_frame.go index 8e9a41d8..51972937 100644 --- a/internal/wire/retire_connection_id_frame.go +++ b/internal/wire/retire_connection_id_frame.go @@ -3,8 +3,8 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A RetireConnectionIDFrame is a RETIRE_CONNECTION_ID frame diff --git a/internal/wire/retire_connection_id_frame_test.go b/internal/wire/retire_connection_id_frame_test.go index b679e41e..69de814e 100644 --- a/internal/wire/retire_connection_id_frame_test.go +++ b/internal/wire/retire_connection_id_frame_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/short_header.go b/internal/wire/short_header.go index 69aa8341..848e5091 100644 --- a/internal/wire/short_header.go +++ b/internal/wire/short_header.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // ParseShortHeader parses a short header packet. diff --git a/internal/wire/short_header_test.go b/internal/wire/short_header_test.go index 64146ecf..ed29bcdb 100644 --- a/internal/wire/short_header_test.go +++ b/internal/wire/short_header_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/stop_sending_frame.go b/internal/wire/stop_sending_frame.go index d7b8b240..0467c4d2 100644 --- a/internal/wire/stop_sending_frame.go +++ b/internal/wire/stop_sending_frame.go @@ -3,9 +3,9 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" ) // A StopSendingFrame is a STOP_SENDING frame diff --git a/internal/wire/stop_sending_frame_test.go b/internal/wire/stop_sending_frame_test.go index fef31752..dc04efd6 100644 --- a/internal/wire/stop_sending_frame_test.go +++ b/internal/wire/stop_sending_frame_test.go @@ -4,9 +4,9 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/stream_data_blocked_frame.go b/internal/wire/stream_data_blocked_frame.go index d42e59a2..26f428c0 100644 --- a/internal/wire/stream_data_blocked_frame.go +++ b/internal/wire/stream_data_blocked_frame.go @@ -3,8 +3,8 @@ package wire import ( "bytes" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A StreamDataBlockedFrame is a STREAM_DATA_BLOCKED frame diff --git a/internal/wire/stream_data_blocked_frame_test.go b/internal/wire/stream_data_blocked_frame_test.go index 5bdb241b..39164afa 100644 --- a/internal/wire/stream_data_blocked_frame_test.go +++ b/internal/wire/stream_data_blocked_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/stream_frame.go b/internal/wire/stream_frame.go index d22e1c05..bbe3dece 100644 --- a/internal/wire/stream_frame.go +++ b/internal/wire/stream_frame.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A StreamFrame of QUIC diff --git a/internal/wire/stream_frame_test.go b/internal/wire/stream_frame_test.go index ed63c54c..902a0526 100644 --- a/internal/wire/stream_frame_test.go +++ b/internal/wire/stream_frame_test.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/streams_blocked_frame.go b/internal/wire/streams_blocked_frame.go index 4a5951c6..450cb03c 100644 --- a/internal/wire/streams_blocked_frame.go +++ b/internal/wire/streams_blocked_frame.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" ) // A StreamsBlockedFrame is a STREAMS_BLOCKED frame diff --git a/internal/wire/streams_blocked_frame_test.go b/internal/wire/streams_blocked_frame_test.go index fcf20452..58c06270 100644 --- a/internal/wire/streams_blocked_frame_test.go +++ b/internal/wire/streams_blocked_frame_test.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/transport_parameter_test.go b/internal/wire/transport_parameter_test.go index 9dd306b7..48ae0923 100644 --- a/internal/wire/transport_parameter_test.go +++ b/internal/wire/transport_parameter_test.go @@ -9,9 +9,9 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/transport_parameters.go b/internal/wire/transport_parameters.go index b9bf8572..7a24e2ce 100644 --- a/internal/wire/transport_parameters.go +++ b/internal/wire/transport_parameters.go @@ -11,10 +11,10 @@ import ( "sort" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/quicvarint" tls "github.com/refraction-networking/utls" ) diff --git a/internal/wire/version_negotiation.go b/internal/wire/version_negotiation.go index 3dc62113..cbaa2cb5 100644 --- a/internal/wire/version_negotiation.go +++ b/internal/wire/version_negotiation.go @@ -6,8 +6,8 @@ import ( "encoding/binary" "errors" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // ParseVersionNegotiationPacket parses a Version Negotiation packet. diff --git a/internal/wire/version_negotiation_test.go b/internal/wire/version_negotiation_test.go index 65d0ba91..529a3234 100644 --- a/internal/wire/version_negotiation_test.go +++ b/internal/wire/version_negotiation_test.go @@ -5,7 +5,7 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/wire/wire_suite_test.go b/internal/wire/wire_suite_test.go index d68c6ee7..161b6e7f 100644 --- a/internal/wire/wire_suite_test.go +++ b/internal/wire/wire_suite_test.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "testing" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/quicvarint" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/logging/frame.go b/logging/frame.go index 9a055db3..b5cecd9a 100644 --- a/logging/frame.go +++ b/logging/frame.go @@ -1,6 +1,6 @@ package logging -import "github.com/quic-go/quic-go/internal/wire" +import "github.com/refraction-networking/uquic/internal/wire" // A Frame is a QUIC frame type Frame interface{} diff --git a/logging/interface.go b/logging/interface.go index 2ce8582e..dfa434fd 100644 --- a/logging/interface.go +++ b/logging/interface.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type ( diff --git a/logging/mock_connection_tracer_test.go b/logging/mock_connection_tracer_test.go index ac6d5fd7..5fad29ce 100644 --- a/logging/mock_connection_tracer_test.go +++ b/logging/mock_connection_tracer_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/logging (interfaces: ConnectionTracer) +// Source: github.com/refraction-networking/uquic/logging (interfaces: ConnectionTracer) // Package logging is a generated GoMock package. package logging @@ -10,9 +10,9 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - utils "github.com/quic-go/quic-go/internal/utils" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + utils "github.com/refraction-networking/uquic/internal/utils" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockConnectionTracer is a mock of ConnectionTracer interface. diff --git a/logging/mock_tracer_test.go b/logging/mock_tracer_test.go index 8526cd3a..cb13831d 100644 --- a/logging/mock_tracer_test.go +++ b/logging/mock_tracer_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go/logging (interfaces: Tracer) +// Source: github.com/refraction-networking/uquic/logging (interfaces: Tracer) // Package logging is a generated GoMock package. package logging @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockTracer is a mock of Tracer interface. diff --git a/logging/mockgen.go b/logging/mockgen.go index d5091679..8b7fab64 100644 --- a/logging/mockgen.go +++ b/logging/mockgen.go @@ -1,4 +1,4 @@ package logging -//go:generate sh -c "go run github.com/golang/mock/mockgen -package logging -self_package github.com/quic-go/quic-go/logging -destination mock_connection_tracer_test.go github.com/quic-go/quic-go/logging ConnectionTracer" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package logging -self_package github.com/quic-go/quic-go/logging -destination mock_tracer_test.go github.com/quic-go/quic-go/logging Tracer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package logging -self_package github.com/refraction-networking/uquic/logging -destination mock_connection_tracer_test.go github.com/refraction-networking/uquic/logging ConnectionTracer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package logging -self_package github.com/refraction-networking/uquic/logging -destination mock_tracer_test.go github.com/refraction-networking/uquic/logging Tracer" diff --git a/logging/multiplex_test.go b/logging/multiplex_test.go index d2220499..0d21a0c6 100644 --- a/logging/multiplex_test.go +++ b/logging/multiplex_test.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/logging/packet_header.go b/logging/packet_header.go index 6b8df58d..328119f0 100644 --- a/logging/packet_header.go +++ b/logging/packet_header.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // PacketTypeFromHeader determines the packet type from a *wire.Header. diff --git a/logging/packet_header_test.go b/logging/packet_header_test.go index 6df41925..c10a028f 100644 --- a/logging/packet_header_test.go +++ b/logging/packet_header_test.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/mock_ack_frame_source_test.go b/mock_ack_frame_source_test.go index 1284752b..ab70a522 100644 --- a/mock_ack_frame_source_test.go +++ b/mock_ack_frame_source_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: AckFrameSource) +// Source: github.com/refraction-networking/uquic (interfaces: AckFrameSource) // Package quic is a generated GoMock package. package quic @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockAckFrameSource is a mock of AckFrameSource interface. diff --git a/mock_conn_runner_test.go b/mock_conn_runner_test.go index ec587323..ea9e8f56 100644 --- a/mock_conn_runner_test.go +++ b/mock_conn_runner_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: ConnRunner) +// Source: github.com/refraction-networking/uquic (interfaces: ConnRunner) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockConnRunner is a mock of ConnRunner interface. diff --git a/mock_crypto_data_handler_test.go b/mock_crypto_data_handler_test.go index d077886c..9bc0e86f 100644 --- a/mock_crypto_data_handler_test.go +++ b/mock_crypto_data_handler_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: CryptoDataHandler) +// Source: github.com/refraction-networking/uquic (interfaces: CryptoDataHandler) // Package quic is a generated GoMock package. package quic @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - handshake "github.com/quic-go/quic-go/internal/handshake" - protocol "github.com/quic-go/quic-go/internal/protocol" + handshake "github.com/refraction-networking/uquic/internal/handshake" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockCryptoDataHandler is a mock of CryptoDataHandler interface. diff --git a/mock_crypto_stream_test.go b/mock_crypto_stream_test.go index c2048fa8..737bc08e 100644 --- a/mock_crypto_stream_test.go +++ b/mock_crypto_stream_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: CryptoStream) +// Source: github.com/refraction-networking/uquic (interfaces: CryptoStream) // Package quic is a generated GoMock package. package quic @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockCryptoStream is a mock of CryptoStream interface. diff --git a/mock_frame_source_test.go b/mock_frame_source_test.go index e23aa39d..622cb78b 100644 --- a/mock_frame_source_test.go +++ b/mock_frame_source_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: FrameSource) +// Source: github.com/refraction-networking/uquic (interfaces: FrameSource) // Package quic is a generated GoMock package. package quic @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockFrameSource is a mock of FrameSource interface. diff --git a/mock_mtu_discoverer_test.go b/mock_mtu_discoverer_test.go index 406943c5..3ebe8f4e 100644 --- a/mock_mtu_discoverer_test.go +++ b/mock_mtu_discoverer_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: MTUDiscoverer) +// Source: github.com/refraction-networking/uquic (interfaces: MTUDiscoverer) // Package quic is a generated GoMock package. package quic @@ -9,8 +9,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockMTUDiscoverer is a mock of MTUDiscoverer interface. diff --git a/mock_packer_test.go b/mock_packer_test.go index d54fe58b..fe966fb9 100644 --- a/mock_packer_test.go +++ b/mock_packer_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: Packer) +// Source: github.com/refraction-networking/uquic (interfaces: Packer) // Package quic is a generated GoMock package. package quic @@ -8,9 +8,9 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" ) // MockPacker is a mock of Packer interface. diff --git a/mock_packet_handler_manager_test.go b/mock_packet_handler_manager_test.go index 7b70a8db..7b5c9a96 100644 --- a/mock_packet_handler_manager_test.go +++ b/mock_packet_handler_manager_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: PacketHandlerManager) +// Source: github.com/refraction-networking/uquic (interfaces: PacketHandlerManager) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockPacketHandlerManager is a mock of PacketHandlerManager interface. diff --git a/mock_packet_handler_test.go b/mock_packet_handler_test.go index 529d1b84..823d2358 100644 --- a/mock_packet_handler_test.go +++ b/mock_packet_handler_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: PacketHandler) +// Source: github.com/refraction-networking/uquic (interfaces: PacketHandler) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockPacketHandler is a mock of PacketHandler interface. diff --git a/mock_quic_conn_test.go b/mock_quic_conn_test.go index 18932051..30a29199 100644 --- a/mock_quic_conn_test.go +++ b/mock_quic_conn_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: QUICConn) +// Source: github.com/refraction-networking/uquic (interfaces: QUICConn) // Package quic is a generated GoMock package. package quic @@ -10,8 +10,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" ) // MockQUICConn is a mock of QUICConn interface. diff --git a/mock_receive_stream_internal_test.go b/mock_receive_stream_internal_test.go index a4cbb276..72f9757e 100644 --- a/mock_receive_stream_internal_test.go +++ b/mock_receive_stream_internal_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: ReceiveStreamI) +// Source: github.com/refraction-networking/uquic (interfaces: ReceiveStreamI) // Package quic is a generated GoMock package. package quic @@ -9,9 +9,9 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockReceiveStreamI is a mock of ReceiveStreamI interface. diff --git a/mock_sealing_manager_test.go b/mock_sealing_manager_test.go index 26e442e5..a8750905 100644 --- a/mock_sealing_manager_test.go +++ b/mock_sealing_manager_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: SealingManager) +// Source: github.com/refraction-networking/uquic (interfaces: SealingManager) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - handshake "github.com/quic-go/quic-go/internal/handshake" + handshake "github.com/refraction-networking/uquic/internal/handshake" ) // MockSealingManager is a mock of SealingManager interface. diff --git a/mock_send_conn_test.go b/mock_send_conn_test.go index 62c01a23..e63df48f 100644 --- a/mock_send_conn_test.go +++ b/mock_send_conn_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: SendConn) +// Source: github.com/refraction-networking/uquic (interfaces: SendConn) // Package quic is a generated GoMock package. package quic @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockSendConn is a mock of SendConn interface. diff --git a/mock_send_stream_internal_test.go b/mock_send_stream_internal_test.go index c0581bc2..2332e5ef 100644 --- a/mock_send_stream_internal_test.go +++ b/mock_send_stream_internal_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: SendStreamI) +// Source: github.com/refraction-networking/uquic (interfaces: SendStreamI) // Package quic is a generated GoMock package. package quic @@ -10,10 +10,10 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" - wire "github.com/quic-go/quic-go/internal/wire" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockSendStreamI is a mock of SendStreamI interface. diff --git a/mock_sender_test.go b/mock_sender_test.go index feafdf4e..bb3fa128 100644 --- a/mock_sender_test.go +++ b/mock_sender_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: Sender) +// Source: github.com/refraction-networking/uquic (interfaces: Sender) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockSender is a mock of Sender interface. diff --git a/mock_stream_getter_test.go b/mock_stream_getter_test.go index d0238750..6f859057 100644 --- a/mock_stream_getter_test.go +++ b/mock_stream_getter_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: StreamGetter) +// Source: github.com/refraction-networking/uquic (interfaces: StreamGetter) // Package quic is a generated GoMock package. package quic @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" + protocol "github.com/refraction-networking/uquic/internal/protocol" ) // MockStreamGetter is a mock of StreamGetter interface. diff --git a/mock_stream_internal_test.go b/mock_stream_internal_test.go index 512b4b1d..7acb402c 100644 --- a/mock_stream_internal_test.go +++ b/mock_stream_internal_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: StreamI) +// Source: github.com/refraction-networking/uquic (interfaces: StreamI) // Package quic is a generated GoMock package. package quic @@ -10,10 +10,10 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - ackhandler "github.com/quic-go/quic-go/internal/ackhandler" - protocol "github.com/quic-go/quic-go/internal/protocol" - qerr "github.com/quic-go/quic-go/internal/qerr" - wire "github.com/quic-go/quic-go/internal/wire" + ackhandler "github.com/refraction-networking/uquic/internal/ackhandler" + protocol "github.com/refraction-networking/uquic/internal/protocol" + qerr "github.com/refraction-networking/uquic/internal/qerr" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockStreamI is a mock of StreamI interface. diff --git a/mock_stream_manager_test.go b/mock_stream_manager_test.go index 2159372d..53294be4 100644 --- a/mock_stream_manager_test.go +++ b/mock_stream_manager_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: StreamManager) +// Source: github.com/refraction-networking/uquic (interfaces: StreamManager) // Package quic is a generated GoMock package. package quic @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockStreamManager is a mock of StreamManager interface. diff --git a/mock_stream_sender_test.go b/mock_stream_sender_test.go index b4898c67..c23ad3a9 100644 --- a/mock_stream_sender_test.go +++ b/mock_stream_sender_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: StreamSender) +// Source: github.com/refraction-networking/uquic (interfaces: StreamSender) // Package quic is a generated GoMock package. package quic @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockStreamSender is a mock of StreamSender interface. diff --git a/mock_token_store_test.go b/mock_token_store_test.go index 0fb461a6..72d85962 100644 --- a/mock_token_store_test.go +++ b/mock_token_store_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: TokenStore) +// Source: github.com/refraction-networking/uquic (interfaces: TokenStore) // Package quic is a generated GoMock package. package quic diff --git a/mock_unknown_packet_handler_test.go b/mock_unknown_packet_handler_test.go index f7489782..09c11569 100644 --- a/mock_unknown_packet_handler_test.go +++ b/mock_unknown_packet_handler_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: UnknownPacketHandler) +// Source: github.com/refraction-networking/uquic (interfaces: UnknownPacketHandler) // Package quic is a generated GoMock package. package quic diff --git a/mock_unpacker_test.go b/mock_unpacker_test.go index a144fb4c..a0d3dc60 100644 --- a/mock_unpacker_test.go +++ b/mock_unpacker_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/quic-go/quic-go (interfaces: Unpacker) +// Source: github.com/refraction-networking/uquic (interfaces: Unpacker) // Package quic is a generated GoMock package. package quic @@ -9,8 +9,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - protocol "github.com/quic-go/quic-go/internal/protocol" - wire "github.com/quic-go/quic-go/internal/wire" + protocol "github.com/refraction-networking/uquic/internal/protocol" + wire "github.com/refraction-networking/uquic/internal/wire" ) // MockUnpacker is a mock of Unpacker interface. diff --git a/mockgen.go b/mockgen.go index eb700864..de20437a 100644 --- a/mockgen.go +++ b/mockgen.go @@ -2,73 +2,73 @@ package quic -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_send_conn_test.go github.com/quic-go/quic-go SendConn" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_send_conn_test.go github.com/refraction-networking/uquic SendConn" type SendConn = sendConn -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_sender_test.go github.com/quic-go/quic-go Sender" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_sender_test.go github.com/refraction-networking/uquic Sender" type Sender = sender -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_stream_internal_test.go github.com/quic-go/quic-go StreamI" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_stream_internal_test.go github.com/refraction-networking/uquic StreamI" type StreamI = streamI -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_crypto_stream_test.go github.com/quic-go/quic-go CryptoStream" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_crypto_stream_test.go github.com/refraction-networking/uquic CryptoStream" type CryptoStream = cryptoStream -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_receive_stream_internal_test.go github.com/quic-go/quic-go ReceiveStreamI" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_receive_stream_internal_test.go github.com/refraction-networking/uquic ReceiveStreamI" type ReceiveStreamI = receiveStreamI -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_send_stream_internal_test.go github.com/quic-go/quic-go SendStreamI" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_send_stream_internal_test.go github.com/refraction-networking/uquic SendStreamI" type SendStreamI = sendStreamI -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_stream_getter_test.go github.com/quic-go/quic-go StreamGetter" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_stream_getter_test.go github.com/refraction-networking/uquic StreamGetter" type StreamGetter = streamGetter -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_stream_sender_test.go github.com/quic-go/quic-go StreamSender" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_stream_sender_test.go github.com/refraction-networking/uquic StreamSender" type StreamSender = streamSender -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_crypto_data_handler_test.go github.com/quic-go/quic-go CryptoDataHandler" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_crypto_data_handler_test.go github.com/refraction-networking/uquic CryptoDataHandler" type CryptoDataHandler = cryptoDataHandler -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_frame_source_test.go github.com/quic-go/quic-go FrameSource" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_frame_source_test.go github.com/refraction-networking/uquic FrameSource" type FrameSource = frameSource -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_ack_frame_source_test.go github.com/quic-go/quic-go AckFrameSource" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_ack_frame_source_test.go github.com/refraction-networking/uquic AckFrameSource" type AckFrameSource = ackFrameSource -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_stream_manager_test.go github.com/quic-go/quic-go StreamManager" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_stream_manager_test.go github.com/refraction-networking/uquic StreamManager" type StreamManager = streamManager -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_sealing_manager_test.go github.com/quic-go/quic-go SealingManager" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_sealing_manager_test.go github.com/refraction-networking/uquic SealingManager" type SealingManager = sealingManager -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_unpacker_test.go github.com/quic-go/quic-go Unpacker" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_unpacker_test.go github.com/refraction-networking/uquic Unpacker" type Unpacker = unpacker -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_packer_test.go github.com/quic-go/quic-go Packer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_packer_test.go github.com/refraction-networking/uquic Packer" type Packer = packer -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_mtu_discoverer_test.go github.com/quic-go/quic-go MTUDiscoverer" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_mtu_discoverer_test.go github.com/refraction-networking/uquic MTUDiscoverer" type MTUDiscoverer = mtuDiscoverer -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_conn_runner_test.go github.com/quic-go/quic-go ConnRunner" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_conn_runner_test.go github.com/refraction-networking/uquic ConnRunner" type ConnRunner = connRunner -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_quic_conn_test.go github.com/quic-go/quic-go QUICConn" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_quic_conn_test.go github.com/refraction-networking/uquic QUICConn" type QUICConn = quicConn -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_packet_handler_test.go github.com/quic-go/quic-go PacketHandler" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_packet_handler_test.go github.com/refraction-networking/uquic PacketHandler" type PacketHandler = packetHandler -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_unknown_packet_handler_test.go github.com/quic-go/quic-go UnknownPacketHandler" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_unknown_packet_handler_test.go github.com/refraction-networking/uquic UnknownPacketHandler" type UnknownPacketHandler = unknownPacketHandler -//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/quic-go/quic-go -destination mock_packet_handler_manager_test.go github.com/quic-go/quic-go PacketHandlerManager" +//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package quic -self_package github.com/refraction-networking/uquic -destination mock_packet_handler_manager_test.go github.com/refraction-networking/uquic PacketHandlerManager" type PacketHandlerManager = packetHandlerManager // Need to use source mode for the batchConn, since reflect mode follows type aliases. // See https://github.com/golang/mock/issues/244 for details. // -//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/quic-go/quic-go -source sys_conn_oob.go -destination mock_batch_conn_test.go -mock_names batchConn=MockBatchConn" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/refraction-networking/uquic -source sys_conn_oob.go -destination mock_batch_conn_test.go -mock_names batchConn=MockBatchConn" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/quic-go/quic-go -self_package github.com/quic-go/quic-go -destination mock_token_store_test.go github.com/quic-go/quic-go TokenStore" -//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/quic-go/quic-go -self_package github.com/quic-go/quic-go -destination mock_packetconn_test.go net PacketConn" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/refraction-networking/uquic -self_package github.com/refraction-networking/uquic -destination mock_token_store_test.go github.com/refraction-networking/uquic TokenStore" +//go:generate sh -c "go run github.com/golang/mock/mockgen -package quic -self_package github.com/refraction-networking/uquic -self_package github.com/refraction-networking/uquic -destination mock_packetconn_test.go net PacketConn" diff --git a/mtu_discoverer.go b/mtu_discoverer.go index 317b0929..811183a4 100644 --- a/mtu_discoverer.go +++ b/mtu_discoverer.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type mtuDiscoverer interface { diff --git a/mtu_discoverer_test.go b/mtu_discoverer_test.go index 6e01f570..d0819ef1 100644 --- a/mtu_discoverer_test.go +++ b/mtu_discoverer_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/multiplexer.go b/multiplexer.go index 85f7f403..3b2cefd2 100644 --- a/multiplexer.go +++ b/multiplexer.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/utils" ) var ( @@ -54,7 +54,7 @@ func (m *connMultiplexer) AddConn(c indexableConn) { if ok { // Panics if we're already listening on this connection. // This is a safeguard because we're introducing a breaking API change, see - // https://github.com/quic-go/quic-go/issues/3727 for details. + // https://github.com/refraction-networking/uquic/issues/3727 for details. // We'll remove this at a later time, when most users of the library have made the switch. panic("connection already exists") // TODO: write a nice message } diff --git a/oss-fuzz.sh b/oss-fuzz.sh index 1efe6baa..e711d94a 100644 --- a/oss-fuzz.sh +++ b/oss-fuzz.sh @@ -17,11 +17,11 @@ compile_go_fuzzer github.com/quic-go/qpack/fuzzing Fuzz qpack_fuzzer ( # fuzz quic-go -compile_go_fuzzer github.com/quic-go/quic-go/fuzzing/frames Fuzz frame_fuzzer -compile_go_fuzzer github.com/quic-go/quic-go/fuzzing/header Fuzz header_fuzzer -compile_go_fuzzer github.com/quic-go/quic-go/fuzzing/transportparameters Fuzz transportparameter_fuzzer -compile_go_fuzzer github.com/quic-go/quic-go/fuzzing/tokens Fuzz token_fuzzer -compile_go_fuzzer github.com/quic-go/quic-go/fuzzing/handshake Fuzz handshake_fuzzer +compile_go_fuzzer github.com/refraction-networking/uquic/fuzzing/frames Fuzz frame_fuzzer +compile_go_fuzzer github.com/refraction-networking/uquic/fuzzing/header Fuzz header_fuzzer +compile_go_fuzzer github.com/refraction-networking/uquic/fuzzing/transportparameters Fuzz transportparameter_fuzzer +compile_go_fuzzer github.com/refraction-networking/uquic/fuzzing/tokens Fuzz token_fuzzer +compile_go_fuzzer github.com/refraction-networking/uquic/fuzzing/handshake Fuzz handshake_fuzzer if [ $SANITIZER == "coverage" ]; then # no need for corpora if coverage @@ -29,7 +29,7 @@ if [ $SANITIZER == "coverage" ]; then fi # generate seed corpora -cd $GOPATH/src/github.com/quic-go/quic-go/ +cd $GOPATH/src/github.com/refraction-networking/uquic/ go generate -x ./fuzzing/... zip --quiet -r $OUT/header_fuzzer_seed_corpus.zip fuzzing/header/corpus diff --git a/packet_handler_map.go b/packet_handler_map.go index 2a16773c..a99a8562 100644 --- a/packet_handler_map.go +++ b/packet_handler_map.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) type connCapabilities struct { diff --git a/packet_handler_map_test.go b/packet_handler_map_test.go index 24cef871..78b15d9c 100644 --- a/packet_handler_map_test.go +++ b/packet_handler_map_test.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/packet_packer.go b/packet_packer.go index 21af817c..e59304ee 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" ) var errNothingToPack = errors.New("nothing to pack") diff --git a/packet_packer_test.go b/packet_packer_test.go index 3ff15eaf..abf59f32 100644 --- a/packet_packer_test.go +++ b/packet_packer_test.go @@ -8,14 +8,14 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/mocks" - mockackhandler "github.com/quic-go/quic-go/internal/mocks/ackhandler" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/mocks" + mockackhandler "github.com/refraction-networking/uquic/internal/mocks/ackhandler" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" diff --git a/packet_unpacker.go b/packet_unpacker.go index 103524c7..c9d1c0eb 100644 --- a/packet_unpacker.go +++ b/packet_unpacker.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" ) type headerDecryptor interface { diff --git a/packet_unpacker_test.go b/packet_unpacker_test.go index 927635cb..8ca1c8b4 100644 --- a/packet_unpacker_test.go +++ b/packet_unpacker_test.go @@ -4,11 +4,11 @@ import ( "errors" "time" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/qlog/event.go b/qlog/event.go index 9dae7444..1bc19f75 100644 --- a/qlog/event.go +++ b/qlog/event.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" ) diff --git a/qlog/frame.go b/qlog/frame.go index 0d44f073..68eeccb1 100644 --- a/qlog/frame.go +++ b/qlog/frame.go @@ -3,8 +3,8 @@ package qlog import ( "fmt" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" ) diff --git a/qlog/frame_test.go b/qlog/frame_test.go index 0cee3847..2660f47a 100644 --- a/qlog/frame_test.go +++ b/qlog/frame_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" . "github.com/onsi/ginkgo/v2" diff --git a/qlog/packet_header.go b/qlog/packet_header.go index 106499b0..0fbdb6e3 100644 --- a/qlog/packet_header.go +++ b/qlog/packet_header.go @@ -3,8 +3,8 @@ package qlog import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" ) diff --git a/qlog/packet_header_test.go b/qlog/packet_header_test.go index 9d37e556..1c4cdb2a 100644 --- a/qlog/packet_header_test.go +++ b/qlog/packet_header_test.go @@ -6,9 +6,9 @@ import ( "github.com/francoispqt/gojay" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/qlog/qlog.go b/qlog/qlog.go index 4c480e26..d120c320 100644 --- a/qlog/qlog.go +++ b/qlog/qlog.go @@ -10,17 +10,17 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" ) // Setting of this only works when quic-go is used as a library. // When building a binary from this repository, the version can be set using the following go build flag: -// -ldflags="-X github.com/quic-go/quic-go/qlog.quicGoVersion=foobar" +// -ldflags="-X github.com/refraction-networking/uquic/qlog.quicGoVersion=foobar" var quicGoVersion = "(devel)" func init() { @@ -32,7 +32,7 @@ func init() { return } for _, d := range info.Deps { - if d.Path == "github.com/quic-go/quic-go" { + if d.Path == "github.com/refraction-networking/uquic" { quicGoVersion = d.Version if d.Replace != nil { if len(d.Replace.Version) > 0 { diff --git a/qlog/qlog_test.go b/qlog/qlog_test.go index dc0d2dc1..4581630b 100644 --- a/qlog/qlog_test.go +++ b/qlog/qlog_test.go @@ -10,11 +10,11 @@ import ( "os" "time" - "github.com/quic-go/quic-go" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + quic "github.com/refraction-networking/uquic" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/qlog/trace.go b/qlog/trace.go index bb1d5bb8..aa8b7431 100644 --- a/qlog/trace.go +++ b/qlog/trace.go @@ -3,8 +3,8 @@ package qlog import ( "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/logging" "github.com/francoispqt/gojay" ) diff --git a/qlog/types.go b/qlog/types.go index c47ad481..ff6db979 100644 --- a/qlog/types.go +++ b/qlog/types.go @@ -3,9 +3,9 @@ package qlog import ( "fmt" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/logging" ) type owner uint8 diff --git a/qlog/types_test.go b/qlog/types_test.go index 9213ad31..2b8312f6 100644 --- a/qlog/types_test.go +++ b/qlog/types_test.go @@ -8,9 +8,9 @@ import ( "runtime" "strconv" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/quicvarint/varint.go b/quicvarint/varint.go index 3f12c076..fb7bd867 100644 --- a/quicvarint/varint.go +++ b/quicvarint/varint.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // taken from the QUIC draft diff --git a/receive_stream.go b/receive_stream.go index 89d02b73..f8b82bca 100644 --- a/receive_stream.go +++ b/receive_stream.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type receiveStreamI interface { diff --git a/receive_stream_test.go b/receive_stream_test.go index f3c515e6..9cdbbd72 100644 --- a/receive_stream_test.go +++ b/receive_stream_test.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/retransmission_queue.go b/retransmission_queue.go index 909ad622..ec96991a 100644 --- a/retransmission_queue.go +++ b/retransmission_queue.go @@ -3,10 +3,10 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/ackhandler" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type retransmissionQueue struct { diff --git a/retransmission_queue_test.go b/retransmission_queue_test.go index c0132848..58f15562 100644 --- a/retransmission_queue_test.go +++ b/retransmission_queue_test.go @@ -1,8 +1,8 @@ package quic import ( - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/send_conn.go b/send_conn.go index 4e7007fa..63636e78 100644 --- a/send_conn.go +++ b/send_conn.go @@ -4,7 +4,7 @@ import ( "math" "net" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" ) // A sendConn allows sending using a simple Write() on a non-connected packet conn. diff --git a/send_queue.go b/send_queue.go index a9f7ca1a..ffcd2553 100644 --- a/send_queue.go +++ b/send_queue.go @@ -1,6 +1,6 @@ package quic -import "github.com/quic-go/quic-go/internal/protocol" +import "github.com/refraction-networking/uquic/internal/protocol" type sender interface { Send(p *packetBuffer, packetSize protocol.ByteCount) diff --git a/send_queue_test.go b/send_queue_test.go index 5a9e6598..1bc260b1 100644 --- a/send_queue_test.go +++ b/send_queue_test.go @@ -3,7 +3,7 @@ package quic import ( "errors" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/send_stream.go b/send_stream.go index 4113d9f0..21a843ce 100644 --- a/send_stream.go +++ b/send_stream.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" ) type sendStreamI interface { diff --git a/send_stream_test.go b/send_stream_test.go index 3356b420..0a9f7499 100644 --- a/send_stream_test.go +++ b/send_stream_test.go @@ -12,10 +12,10 @@ import ( "golang.org/x/exp/rand" "github.com/golang/mock/gomock" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/server.go b/server.go index 3e82a87d..1815be3f 100644 --- a/server.go +++ b/server.go @@ -12,12 +12,12 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" ) // ErrServerClosed is returned by the Listener or EarlyListener's Accept method after a call to Close. diff --git a/server_test.go b/server_test.go index 38af95c3..c3064016 100644 --- a/server_test.go +++ b/server_test.go @@ -12,14 +12,14 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/handshake" - mocklogging "github.com/quic-go/quic-go/internal/mocks/logging" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/testdata" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/handshake" + mocklogging "github.com/refraction-networking/uquic/internal/mocks/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/testdata" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/stream.go b/stream.go index ab76eaf8..8602ec18 100644 --- a/stream.go +++ b/stream.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type deadlineError struct{} diff --git a/stream_test.go b/stream_test.go index e1e3804f..3f6f400f 100644 --- a/stream_test.go +++ b/stream_test.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/streams_map.go b/streams_map.go index b1a80eb3..92704734 100644 --- a/streams_map.go +++ b/streams_map.go @@ -7,10 +7,10 @@ import ( "net" "sync" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" ) type streamError struct { diff --git a/streams_map_incoming.go b/streams_map_incoming.go index 18ec6f99..f6f4a3d5 100644 --- a/streams_map_incoming.go +++ b/streams_map_incoming.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type incomingStream interface { diff --git a/streams_map_incoming_test.go b/streams_map_incoming_test.go index c3366542..3928997b 100644 --- a/streams_map_incoming_test.go +++ b/streams_map_incoming_test.go @@ -7,8 +7,8 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/streams_map_outgoing.go b/streams_map_outgoing.go index fd45f4e7..c9699168 100644 --- a/streams_map_outgoing.go +++ b/streams_map_outgoing.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type outgoingStream interface { diff --git a/streams_map_outgoing_test.go b/streams_map_outgoing_test.go index 7b4b28c3..4ab03581 100644 --- a/streams_map_outgoing_test.go +++ b/streams_map_outgoing_test.go @@ -10,8 +10,8 @@ import ( "golang.org/x/exp/rand" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/streams_map_test.go b/streams_map_test.go index 6300ea8d..1afc1db9 100644 --- a/streams_map_test.go +++ b/streams_map_test.go @@ -8,11 +8,11 @@ import ( "github.com/golang/mock/gomock" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/qerr" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/qerr" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/sys_conn.go b/sys_conn.go index 414472e7..d1ba2bbd 100644 --- a/sys_conn.go +++ b/sys_conn.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) // OOBCapablePacketConn is a connection that allows the reading of ECN bits from the IP header. @@ -34,7 +34,7 @@ func wrapConn(pc net.PacketConn) (rawConn, error) { if disable, _ := strconv.ParseBool(os.Getenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING")); disable { return } - log.Printf("%s. See https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes for details.", err) + log.Printf("%s. See https://github.com/refraction-networking/uquic/wiki/UDP-Buffer-Sizes for details.", err) }) } } @@ -44,7 +44,7 @@ func wrapConn(pc net.PacketConn) (rawConn, error) { if disable, _ := strconv.ParseBool(os.Getenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING")); disable { return } - log.Printf("%s. See https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes for details.", err) + log.Printf("%s. See https://github.com/refraction-networking/uquic/wiki/UDP-Buffer-Sizes for details.", err) }) } } diff --git a/sys_conn_buffers.go b/sys_conn_buffers.go index 8fe49162..aa2bfbce 100644 --- a/sys_conn_buffers.go +++ b/sys_conn_buffers.go @@ -6,8 +6,8 @@ import ( "net" "syscall" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) //go:generate sh -c "echo '// Code generated by go generate. DO NOT EDIT.\n// Source: sys_conn_buffers.go\n' > sys_conn_buffers_write.go && sed -e 's/SetReadBuffer/SetWriteBuffer/g' -e 's/setReceiveBuffer/setSendBuffer/g' -e 's/inspectReadBuffer/inspectWriteBuffer/g' -e 's/protocol\\.DesiredReceiveBufferSize/protocol\\.DesiredSendBufferSize/g' -e 's/forceSetReceiveBuffer/forceSetSendBuffer/g' -e 's/receive buffer/send buffer/g' sys_conn_buffers.go | sed '/^\\/\\/go:generate/d' >> sys_conn_buffers_write.go" diff --git a/sys_conn_buffers_write.go b/sys_conn_buffers_write.go index c01a931b..4863b2f6 100644 --- a/sys_conn_buffers_write.go +++ b/sys_conn_buffers_write.go @@ -9,8 +9,8 @@ import ( "net" "syscall" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) func setSendBuffer(c net.PacketConn) error { diff --git a/sys_conn_df_darwin.go b/sys_conn_df_darwin.go index b51cd8f1..f9bcfd23 100644 --- a/sys_conn_df_darwin.go +++ b/sys_conn_df_darwin.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/utils" ) func setDF(rawConn syscall.RawConn) (bool, error) { @@ -39,7 +39,7 @@ func setDF(rawConn syscall.RawConn) (bool, error) { // On macOS, the syscall for setting DF bit for IPv4 fails on dual-stack listeners. // Treat the connection as not having DF enabled, even though the DF bit will be set // when used for IPv6. - // See https://github.com/quic-go/quic-go/issues/3793 for details. + // See https://github.com/refraction-networking/uquic/issues/3793 for details. return false, nil case errDFIPv4 != nil && errDFIPv6 != nil: return false, errors.New("setting DF failed for both IPv4 and IPv6") diff --git a/sys_conn_df_linux.go b/sys_conn_df_linux.go index 199f6347..4a988b33 100644 --- a/sys_conn_df_linux.go +++ b/sys_conn_df_linux.go @@ -12,7 +12,7 @@ import ( "golang.org/x/sys/unix" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/utils" ) func setDF(rawConn syscall.RawConn) (bool, error) { diff --git a/sys_conn_df_windows.go b/sys_conn_df_windows.go index e27635ec..8e32770d 100644 --- a/sys_conn_df_windows.go +++ b/sys_conn_df_windows.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/windows" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/utils" ) const ( diff --git a/sys_conn_oob.go b/sys_conn_oob.go index 84d5e7e6..140bb2f4 100644 --- a/sys_conn_oob.go +++ b/sys_conn_oob.go @@ -17,8 +17,8 @@ import ( "golang.org/x/net/ipv6" "golang.org/x/sys/unix" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" ) const ( diff --git a/sys_conn_oob_test.go b/sys_conn_oob_test.go index 30b333b9..dce9d0b5 100644 --- a/sys_conn_oob_test.go +++ b/sys_conn_oob_test.go @@ -10,8 +10,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/sys/unix" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/sys_conn_test.go b/sys_conn_test.go index 418e2c31..41269a0f 100644 --- a/sys_conn_test.go +++ b/sys_conn_test.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" "github.com/golang/mock/gomock" diff --git a/token_store.go b/token_store.go index 00460e50..9f3b968b 100644 --- a/token_store.go +++ b/token_store.go @@ -3,8 +3,8 @@ package quic import ( "sync" - "github.com/quic-go/quic-go/internal/utils" - list "github.com/quic-go/quic-go/internal/utils/linkedlist" + "github.com/refraction-networking/uquic/internal/utils" + list "github.com/refraction-networking/uquic/internal/utils/linkedlist" ) type singleOriginTokenStore struct { diff --git a/transport.go b/transport.go index e002a261..ff4cf144 100644 --- a/transport.go +++ b/transport.go @@ -10,11 +10,11 @@ import ( tls "github.com/refraction-networking/utls" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/wire" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/logging" ) // The Transport is the central point to manage incoming and outgoing QUIC connections. @@ -323,7 +323,7 @@ func (t *Transport) listen(conn rawConn) { //nolint:staticcheck // SA1019 ignore this! // TODO: This code is used to ignore wsa errors on Windows. // Since net.Error.Temporary is deprecated as of Go 1.18, we should find a better solution. - // See https://github.com/quic-go/quic-go/issues/1737 for details. + // See https://github.com/refraction-networking/uquic/issues/1737 for details. if nerr, ok := err.(net.Error); ok && nerr.Temporary() { t.mutex.Lock() closed := t.closed diff --git a/transport_test.go b/transport_test.go index 21bcb295..025e5322 100644 --- a/transport_test.go +++ b/transport_test.go @@ -10,10 +10,10 @@ import ( tls "github.com/refraction-networking/utls" - mocklogging "github.com/quic-go/quic-go/internal/mocks/logging" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + mocklogging "github.com/refraction-networking/uquic/internal/mocks/logging" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/u_client.go b/u_client.go index e3b0a408..19b049aa 100644 --- a/u_client.go +++ b/u_client.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" tls "github.com/refraction-networking/utls" ) diff --git a/u_connection.go b/u_connection.go index 9a1803e4..37871f15 100644 --- a/u_connection.go +++ b/u_connection.go @@ -3,12 +3,12 @@ package quic import ( "context" - "github.com/quic-go/quic-go/internal/ackhandler" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/utils" - "github.com/quic-go/quic-go/internal/wire" - "github.com/quic-go/quic-go/logging" + "github.com/refraction-networking/uquic/internal/ackhandler" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/utils" + "github.com/refraction-networking/uquic/internal/wire" + "github.com/refraction-networking/uquic/logging" tls "github.com/refraction-networking/utls" ) @@ -124,7 +124,7 @@ var newUClientConnection = func( // different from protocol.DefaultActiveConnectionIDLimit. // If set to the default value, it will be omitted from the transport parameters, which will make // old quic-go versions interpret it as 0, instead of the default value of 2. - // See https://github.com/quic-go/quic-go/pull/3806. + // See https://github.com/refraction-networking/uquic/pull/3806. ActiveConnectionIDLimit: protocol.MaxActiveConnectionIDs, InitialSourceConnectionID: srcConnID, } diff --git a/u_initial_packet_spec.go b/u_initial_packet_spec.go index 070fd292..6c911493 100644 --- a/u_initial_packet_spec.go +++ b/u_initial_packet_spec.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/gaukas/clienthellod" - "github.com/quic-go/quic-go/quicvarint" + "github.com/refraction-networking/uquic/quicvarint" ) type InitialPacketSpec struct { diff --git a/u_packet_packer.go b/u_packet_packer.go index 0d984507..1e60f3a0 100644 --- a/u_packet_packer.go +++ b/u_packet_packer.go @@ -3,9 +3,9 @@ package quic import ( "fmt" - "github.com/quic-go/quic-go/internal/handshake" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/handshake" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) // uPacketPacker is an extended packetPacker which is used diff --git a/u_transport.go b/u_transport.go index 488d41fa..c1ee3228 100644 --- a/u_transport.go +++ b/u_transport.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/quic-go/quic-go/internal/protocol" + "github.com/refraction-networking/uquic/internal/protocol" tls "github.com/refraction-networking/utls" ) diff --git a/window_update_queue.go b/window_update_queue.go index 9ed12143..3a4f37f0 100644 --- a/window_update_queue.go +++ b/window_update_queue.go @@ -3,9 +3,9 @@ package quic import ( "sync" - "github.com/quic-go/quic-go/internal/flowcontrol" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/flowcontrol" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" ) type windowUpdateQueue struct { diff --git a/window_update_queue_test.go b/window_update_queue_test.go index 492fd596..f22ba78d 100644 --- a/window_update_queue_test.go +++ b/window_update_queue_test.go @@ -1,9 +1,9 @@ package quic import ( - "github.com/quic-go/quic-go/internal/mocks" - "github.com/quic-go/quic-go/internal/protocol" - "github.com/quic-go/quic-go/internal/wire" + "github.com/refraction-networking/uquic/internal/mocks" + "github.com/refraction-networking/uquic/internal/protocol" + "github.com/refraction-networking/uquic/internal/wire" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega"