Skip to content

Commit

Permalink
Rename module
Browse files Browse the repository at this point in the history
  • Loading branch information
@nekohasekai
nekohasekai committed Oct 1, 2023
1 parent 919a7b8 commit f17fc27
Show file tree
Hide file tree
Showing 225 changed files with 572 additions and 572 deletions.
4 changes: 2 additions & 2 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
- 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.
- 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/sagernet/quic-go) for details.
- Changed the log level environment variable to only accept strings ("DEBUG", "INFO", "ERROR"), see [the wiki](https://github.com/sagernet/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.
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<img src="docs/quic.png" width=303 height=124>

[![PkgGoDev](https://pkg.go.dev/badge/github.com/quic-go/quic-go)](https://pkg.go.dev/github.com/quic-go/quic-go)
[![PkgGoDev](https://pkg.go.dev/badge/github.com/sagernet/quic-go)](https://pkg.go.dev/github.com/sagernet/quic-go)
[![Code Coverage](https://img.shields.io/codecov/c/github/quic-go/quic-go/master.svg?style=flat-square)](https://codecov.io/gh/quic-go/quic-go/)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/quic-go.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:quic-go)

Expand Down Expand Up @@ -227,4 +227,4 @@ This had led to a lot of pain in the Go ecosystem, and we're happy that we can r

## Contributing

We are always happy to welcome new contributors! We have a number of self-contained issues that are suitable for first-time contributors, they are tagged with [help wanted](https://github.com/quic-go/quic-go/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). If you have any questions, please feel free to reach out by opening an issue or leaving a comment.
We are always happy to welcome new contributors! We have a number of self-contained issues that are suitable for first-time contributors, they are tagged with [help wanted](https://github.com/sagernet/quic-go/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). If you have any questions, please feel free to reach out by opening an issue or leaving a comment.
4 changes: 2 additions & 2 deletions SECURITY.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ 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/sagernet/quic-go/security/advisories/new).
Please **DO NOT file a public issue**.

If the issue is an implementation weakness that cannot be immediately exploited or
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/sagernet/quic-go/issues/new).
2 changes: 1 addition & 1 deletion buffer_pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package quic
import (
"sync"

"github.com/quic-go/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/protocol"
)

type packetBuffer struct {
Expand Down
6 changes: 3 additions & 3 deletions client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"errors"
"net"

"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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/logging"
)

type client struct {
Expand Down
4 changes: 2 additions & 2 deletions closed_conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
)

// A closedLocalConn is a connection that we closed locally.
Expand Down
4 changes: 2 additions & 2 deletions config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net"
"time"

"github.com/quic-go/quic-go/internal/protocol"
"github.com/quic-go/quic-go/quicvarint"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/quicvarint"
)

// Clone clones a Config
Expand Down
2 changes: 1 addition & 1 deletion congestion/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package congestion
import (
"time"

"github.com/quic-go/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/protocol"
)

type (
Expand Down
8 changes: 4 additions & 4 deletions conn_id_generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/qerr"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/wire"
)

type connIDGenerator struct {
Expand Down
10 changes: 5 additions & 5 deletions conn_id_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/qerr"
"github.com/sagernet/quic-go/internal/utils"
list "github.com/sagernet/quic-go/internal/utils/linkedlist"
"github.com/sagernet/quic-go/internal/wire"
)

type newConnID struct {
Expand Down
24 changes: 12 additions & 12 deletions connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import (
"sync/atomic"
"time"

"github.com/quic-go/quic-go/congestion"
"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/sagernet/quic-go/congestion"
"github.com/sagernet/quic-go/internal/ackhandler"
"github.com/sagernet/quic-go/internal/flowcontrol"
"github.com/sagernet/quic-go/internal/handshake"
"github.com/sagernet/quic-go/internal/logutils"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/qerr"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/wire"
"github.com/sagernet/quic-go/logging"
)

type unpacker interface {
Expand Down Expand Up @@ -304,7 +304,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/sagernet/quic-go/pull/3806.
ActiveConnectionIDLimit: protocol.MaxActiveConnectionIDs,
InitialSourceConnectionID: srcConnID,
RetrySourceConnectionID: retrySrcConnID,
Expand Down Expand Up @@ -416,7 +416,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/sagernet/quic-go/pull/3806.
ActiveConnectionIDLimit: protocol.MaxActiveConnectionIDs,
InitialSourceConnectionID: srcConnID,
}
Expand Down
2 changes: 1 addition & 1 deletion connection_timer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package quic
import (
"time"

"github.com/quic-go/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/utils"
)

var deadlineSendImmediately = time.Time{}.Add(42 * time.Millisecond) // any value > time.Time{} and before time.Now() is fine
Expand Down
8 changes: 4 additions & 4 deletions crypto_stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/qerr"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/wire"
)

type cryptoStream interface {
Expand Down
6 changes: 3 additions & 3 deletions crypto_stream_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/handshake"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/wire"
)

type cryptoDataHandler interface {
Expand Down
6 changes: 3 additions & 3 deletions datagram_queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/wire"
)

const DatagramFrameMaxPeekTimes = 10
Expand Down
2 changes: 1 addition & 1 deletion errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package quic
import (
"fmt"

"github.com/quic-go/quic-go/internal/qerr"
"github.com/sagernet/quic-go/internal/qerr"
)

type (
Expand Down
6 changes: 3 additions & 3 deletions frame_sorter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package quic
import (
"errors"

"github.com/quic-go/quic-go/internal/protocol"
"github.com/quic-go/quic-go/internal/utils"
"github.com/quic-go/quic-go/internal/utils/tree"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/internal/utils/tree"
)

// byteInterval is an interval from one ByteCount to the other
Expand Down
10 changes: 5 additions & 5 deletions framer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/sagernet/quic-go/internal/ackhandler"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils/ringbuffer"
"github.com/sagernet/quic-go/internal/wire"
"github.com/sagernet/quic-go/quicvarint"
)

type framer interface {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/quic-go/quic-go
module github.com/sagernet/quic-go

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion http3/body.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"net"

"github.com/quic-go/quic-go"
"github.com/sagernet/quic-go"
)

// The HTTPStreamer allows taking over a HTTP/3 stream. The interface is implemented by:
Expand Down
2 changes: 1 addition & 1 deletion http3/capsule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package http3
import (
"io"

"github.com/quic-go/quic-go/quicvarint"
"github.com/sagernet/quic-go/quicvarint"
)

// CapsuleType is the type of the capsule.
Expand Down
8 changes: 4 additions & 4 deletions http3/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"sync/atomic"
"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/quicvarint"
"github.com/sagernet/quic-go"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/quicvarint"

"github.com/quic-go/qpack"
)
Expand Down
2 changes: 1 addition & 1 deletion http3/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

"github.com/quic-go/quic-go"
"github.com/sagernet/quic-go"
)

// Error is returned from the round tripper (for HTTP clients)
Expand Down
2 changes: 1 addition & 1 deletion http3/error_codes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package http3
import (
"fmt"

"github.com/quic-go/quic-go"
"github.com/sagernet/quic-go"
)

type ErrCode quic.ApplicationErrorCode
Expand Down
4 changes: 2 additions & 2 deletions http3/frames.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"io"

"github.com/quic-go/quic-go/internal/protocol"
"github.com/quic-go/quic-go/quicvarint"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/quicvarint"
)

// FrameType is the frame type of a HTTP/3 frame
Expand Down
4 changes: 2 additions & 2 deletions http3/http_stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/internal/utils"
"github.com/sagernet/quic-go"
"github.com/sagernet/quic-go/internal/utils"
)

// A Stream is a HTTP/3 stream.
Expand Down
4 changes: 2 additions & 2 deletions http3/mockgen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package http3

//go:generate sh -c "go run go.uber.org/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 go.uber.org/mock/mockgen -build_flags=\"-tags=gomock\" -package http3 -destination mock_roundtripcloser_test.go github.com/sagernet/quic-go/http3 RoundTripCloser"
type RoundTripCloser = roundTripCloser

//go:generate sh -c "go run go.uber.org/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 go.uber.org/mock/mockgen -package http3 -destination mock_quic_early_listener_test.go github.com/sagernet/quic-go/http3 QUICEarlyListener"
4 changes: 2 additions & 2 deletions http3/request_writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/sagernet/quic-go"
"github.com/sagernet/quic-go/internal/utils"
)

const bodyCopyBufferSize = 8 * 1024
Expand Down
4 changes: 2 additions & 2 deletions http3/response_writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"time"

"github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/internal/utils"
"github.com/sagernet/quic-go"
"github.com/sagernet/quic-go/internal/utils"

"github.com/quic-go/qpack"
)
Expand Down
2 changes: 1 addition & 1 deletion http3/roundtrip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"golang.org/x/net/http/httpguts"

"github.com/quic-go/quic-go"
"github.com/sagernet/quic-go"
)

type roundTripCloser interface {
Expand Down
8 changes: 4 additions & 4 deletions http3/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"sync"
"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/quicvarint"
"github.com/sagernet/quic-go"
"github.com/sagernet/quic-go/internal/protocol"
"github.com/sagernet/quic-go/internal/utils"
"github.com/sagernet/quic-go/quicvarint"

"github.com/quic-go/qpack"
)
Expand Down
Loading

0 comments on commit f17fc27

Please sign in to comment.