chore: update module names (hysteria & quic-go fork)

This commit is contained in:
Toby 2022-08-20 11:44:12 -07:00
parent aad4c44b3d
commit 8960aefca3
30 changed files with 76 additions and 76 deletions

View file

@ -6,9 +6,9 @@
[2]: LICENSE.md
[3]: https://img.shields.io/github/v/release/tobyxdd/hysteria?style=flat-square
[3]: https://img.shields.io/github/v/release/HyNetwork/hysteria?style=flat-square
[4]: https://github.com/tobyxdd/hysteria/releases
[4]: https://github.com/HyNetwork/hysteria/releases
[5]: https://img.shields.io/badge/chat-Telegram-blue?style=flat-square

View file

@ -11,23 +11,23 @@ import (
"os"
"time"
"github.com/HyNetwork/hysteria/pkg/pmtud_fix"
"github.com/HyNetwork/hysteria/pkg/redirect"
"github.com/oschwald/geoip2-golang"
"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
"github.com/tobyxdd/hysteria/pkg/redirect"
"github.com/yosuke-furukawa/json5/encoding/json5"
"github.com/HyNetwork/hysteria/pkg/acl"
hyCongestion "github.com/HyNetwork/hysteria/pkg/congestion"
"github.com/HyNetwork/hysteria/pkg/core"
hyHTTP "github.com/HyNetwork/hysteria/pkg/http"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/relay"
"github.com/HyNetwork/hysteria/pkg/socks5"
"github.com/HyNetwork/hysteria/pkg/tproxy"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/congestion"
"github.com/sirupsen/logrus"
"github.com/tobyxdd/hysteria/pkg/acl"
hyCongestion "github.com/tobyxdd/hysteria/pkg/congestion"
"github.com/tobyxdd/hysteria/pkg/core"
hyHTTP "github.com/tobyxdd/hysteria/pkg/http"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/tobyxdd/hysteria/pkg/relay"
"github.com/tobyxdd/hysteria/pkg/socks5"
"github.com/tobyxdd/hysteria/pkg/tproxy"
"github.com/tobyxdd/hysteria/pkg/transport"
)
func client(config *clientConfig) {

View file

@ -9,9 +9,9 @@ import (
"strings"
"time"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/tun"
"github.com/sirupsen/logrus"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/tun"
)
const license = `Hysteria is a feature-packed proxy & relay utility optimized for lossy, unstable connections.

View file

@ -4,8 +4,8 @@
package main
import (
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/sirupsen/logrus"
"github.com/tobyxdd/hysteria/pkg/core"
)
const license = `The MIT License (MIT)

View file

@ -5,8 +5,8 @@ import (
"net"
"strings"
"github.com/HyNetwork/hysteria/pkg/utils"
rdns "github.com/folbricht/routedns"
"github.com/tobyxdd/hysteria/pkg/utils"
)
var errInvalidSyntax = errors.New("invalid syntax")

View file

@ -8,20 +8,20 @@ import (
"net/http"
"time"
"github.com/HyNetwork/hysteria/cmd/auth"
"github.com/HyNetwork/hysteria/pkg/acl"
hyCongestion "github.com/HyNetwork/hysteria/pkg/congestion"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/pmtud_fix"
"github.com/HyNetwork/hysteria/pkg/sockopt"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/congestion"
"github.com/oschwald/geoip2-golang"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sirupsen/logrus"
"github.com/tobyxdd/hysteria/cmd/auth"
"github.com/tobyxdd/hysteria/pkg/acl"
hyCongestion "github.com/tobyxdd/hysteria/pkg/congestion"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
"github.com/tobyxdd/hysteria/pkg/sockopt"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/yosuke-furukawa/json5/encoding/json5"
)

4
go.mod
View file

@ -1,4 +1,4 @@
module github.com/tobyxdd/hysteria
module github.com/HyNetwork/hysteria
go 1.17
@ -90,4 +90,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
replace github.com/lucas-clemente/quic-go => github.com/tobyxdd/quic-go v0.28.2-0.20220806194731-5be744e08984
replace github.com/lucas-clemente/quic-go => github.com/HyNetwork/quic-go v0.28.2-0.20220806194731-5be744e08984

4
go.sum
View file

@ -74,6 +74,8 @@ github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
github.com/HyNetwork/quic-go v0.28.2-0.20220806194731-5be744e08984 h1:t4+TR7V6zsIbMlnZ089Bf6msyS+irQIE1vFTrsjv3O4=
github.com/HyNetwork/quic-go v0.28.2-0.20220806194731-5be744e08984/go.mod h1:oGz5DKK41cJt5+773+BSO9BXDsREY4HLf7+0odGAPO0=
github.com/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed h1:eqa6queieK8SvoszxCu0WwH7lSVeL4/N/f1JwOMw1G4=
github.com/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed/go.mod h1:rA52xkgZwql9LRZXWb2arHEFP6qSR48KY2xOfWzEciQ=
github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
@ -683,8 +685,6 @@ github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tobyxdd/quic-go v0.28.2-0.20220806194731-5be744e08984 h1:2gxxS9orZKoGr6MvZmda0VTft8LcZopG4bi+qCGl49w=
github.com/tobyxdd/quic-go v0.28.2-0.20220806194731-5be744e08984/go.mod h1:oGz5DKK41cJt5+773+BSO9BXDsREY4HLf7+0odGAPO0=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
github.com/txthinking/runnergroup v0.0.0-20210608031112-152c7c4432bf h1:7PflaKRtU4np/epFxRXlFhlzLXZzKFrH5/I4so5Ove0=

View file

@ -6,9 +6,9 @@ import (
"os"
"strings"
"github.com/HyNetwork/hysteria/pkg/utils"
lru "github.com/hashicorp/golang-lru"
"github.com/oschwald/geoip2-golang"
"github.com/tobyxdd/hysteria/pkg/utils"
)
const entryCacheSize = 1024

View file

@ -6,7 +6,7 @@ import (
"syscall"
"time"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/obfs"
)
const udpBufferSize = 65535

View file

@ -7,7 +7,7 @@ import (
"syscall"
"time"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/obfs"
)
const udpBufferSize = 65535

View file

@ -9,7 +9,7 @@ import (
"syscall"
"time"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/obfs"
)
const udpBufferSize = 65535

View file

@ -12,13 +12,13 @@ import (
"sync"
"time"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/pmtud_fix"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/congestion"
"github.com/lunixbochs/struc"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/tobyxdd/hysteria/pkg/utils"
)
var ErrClosed = errors.New("closed")

View file

@ -7,13 +7,13 @@ import (
"fmt"
"net"
"github.com/HyNetwork/hysteria/pkg/acl"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/pmtud_fix"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/lucas-clemente/quic-go"
"github.com/lunixbochs/struc"
"github.com/prometheus/client_golang/prometheus"
"github.com/tobyxdd/hysteria/pkg/acl"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/tobyxdd/hysteria/pkg/pmtud_fix"
"github.com/tobyxdd/hysteria/pkg/transport"
)
type (

View file

@ -9,12 +9,12 @@ import (
"strconv"
"sync"
"github.com/HyNetwork/hysteria/pkg/acl"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/lucas-clemente/quic-go"
"github.com/lunixbochs/struc"
"github.com/prometheus/client_golang/prometheus"
"github.com/tobyxdd/hysteria/pkg/acl"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/tobyxdd/hysteria/pkg/utils"
)
const udpBufferSize = 65535

View file

@ -7,14 +7,14 @@ import (
"net/http"
"time"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/elazarl/goproxy/ext/auth"
"github.com/HyNetwork/hysteria/pkg/acl"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/elazarl/goproxy"
"github.com/tobyxdd/hysteria/pkg/acl"
"github.com/tobyxdd/hysteria/pkg/core"
)
func NewProxyHTTPServer(hyClient *core.Client, transport *transport.ClientTransport, idleTimeout time.Duration,

View file

@ -7,8 +7,8 @@ import (
"syscall"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/utils"
)
type TCPRedirect struct {

View file

@ -8,7 +8,7 @@ import (
"net"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/core"
)
type TCPRedirect struct{}

View file

@ -4,8 +4,8 @@ import (
"net"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/utils"
)
type TCPRelay struct {

View file

@ -7,7 +7,7 @@ import (
"sync/atomic"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/core"
)
const udpBufferSize = 65535

View file

@ -6,10 +6,10 @@ import (
"fmt"
"strconv"
"github.com/tobyxdd/hysteria/pkg/acl"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/transport"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/HyNetwork/hysteria/pkg/acl"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/transport"
"github.com/HyNetwork/hysteria/pkg/utils"
)
import (

View file

@ -4,9 +4,9 @@ import (
"net"
"time"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/LiamHaworth/go-tproxy"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/utils"
)
type TCPTProxy struct {

View file

@ -8,7 +8,7 @@ import (
"net"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/core"
)
type TCPTProxy struct{}

View file

@ -4,8 +4,8 @@ import (
"net"
"time"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/LiamHaworth/go-tproxy"
"github.com/tobyxdd/hysteria/pkg/core"
)
const udpBufferSize = 65535

View file

@ -8,7 +8,7 @@ import (
"net"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/core"
)
var ErrTimeout = errors.New("inactivity timeout")

View file

@ -6,11 +6,11 @@ import (
"net"
"time"
"github.com/HyNetwork/hysteria/pkg/conns/faketcp"
"github.com/HyNetwork/hysteria/pkg/conns/udp"
"github.com/HyNetwork/hysteria/pkg/conns/wechat"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/lucas-clemente/quic-go"
"github.com/tobyxdd/hysteria/pkg/conns/faketcp"
"github.com/tobyxdd/hysteria/pkg/conns/udp"
"github.com/tobyxdd/hysteria/pkg/conns/wechat"
"github.com/tobyxdd/hysteria/pkg/obfs"
)
type ClientTransport struct {

View file

@ -7,13 +7,13 @@ import (
"strconv"
"time"
"github.com/HyNetwork/hysteria/pkg/conns/faketcp"
"github.com/HyNetwork/hysteria/pkg/conns/udp"
"github.com/HyNetwork/hysteria/pkg/conns/wechat"
"github.com/HyNetwork/hysteria/pkg/obfs"
"github.com/HyNetwork/hysteria/pkg/sockopt"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/lucas-clemente/quic-go"
"github.com/tobyxdd/hysteria/pkg/conns/faketcp"
"github.com/tobyxdd/hysteria/pkg/conns/udp"
"github.com/tobyxdd/hysteria/pkg/conns/wechat"
"github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/tobyxdd/hysteria/pkg/sockopt"
"github.com/tobyxdd/hysteria/pkg/utils"
)
type ServerTransport struct {

View file

@ -12,8 +12,8 @@ import (
"syscall"
"time"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/sirupsen/logrus"
"github.com/tobyxdd/hysteria/pkg/core"
t2score "github.com/xjasonlyu/tun2socks/v2/core"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/core/device"

View file

@ -6,7 +6,7 @@ package tun
import (
"net"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/HyNetwork/hysteria/pkg/utils"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
)

View file

@ -9,7 +9,7 @@ import (
"strconv"
"time"
"github.com/tobyxdd/hysteria/pkg/core"
"github.com/HyNetwork/hysteria/pkg/core"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
)