diff --git a/dialer/http3/dialer.go b/dialer/http3/dialer.go index fd8f714..8cccd0f 100644 --- a/dialer/http3/dialer.go +++ b/dialer/http3/dialer.go @@ -11,8 +11,8 @@ import ( md "github.com/go-gost/core/metadata" pht_util "github.com/go-gost/x/internal/util/pht" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" ) func init() { diff --git a/dialer/icmp/conn.go b/dialer/icmp/conn.go index 39419fb..6d2553d 100644 --- a/dialer/icmp/conn.go +++ b/dialer/icmp/conn.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) type quicSession struct { diff --git a/dialer/icmp/dialer.go b/dialer/icmp/dialer.go index 47b385d..8cf971c 100644 --- a/dialer/icmp/dialer.go +++ b/dialer/icmp/dialer.go @@ -13,7 +13,7 @@ import ( md "github.com/go-gost/core/metadata" icmp_pkg "github.com/go-gost/x/internal/util/icmp" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "golang.org/x/net/icmp" ) diff --git a/dialer/quic/conn.go b/dialer/quic/conn.go index 39419fb..6d2553d 100644 --- a/dialer/quic/conn.go +++ b/dialer/quic/conn.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) type quicSession struct { diff --git a/dialer/quic/dialer.go b/dialer/quic/dialer.go index 404ee7e..c9886b0 100644 --- a/dialer/quic/dialer.go +++ b/dialer/quic/dialer.go @@ -11,7 +11,7 @@ import ( md "github.com/go-gost/core/metadata" quic_util "github.com/go-gost/x/internal/util/quic" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) func init() { diff --git a/go.mod b/go.mod index 18fefed..ee2d9a6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/go-gost/x -go 1.18 +go 1.20 require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 @@ -17,12 +17,12 @@ require ( github.com/golang/snappy v0.0.4 github.com/google/uuid v1.3.0 github.com/gorilla/websocket v1.5.0 - github.com/lucas-clemente/quic-go v0.31.1 github.com/miekg/dns v1.1.50 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pion/dtls/v2 v2.1.5 github.com/pires/go-proxyproto v0.6.2 github.com/prometheus/client_golang v1.14.0 + github.com/quic-go/quic-go v0.32.0 github.com/rs/xid v1.3.0 github.com/shadowsocks/go-shadowsocks2 v0.1.5 github.com/shadowsocks/shadowsocks-go v0.0.0-20200409064450-3e585ff90601 @@ -67,9 +67,6 @@ require ( github.com/klauspost/reedsolomon v1.9.9 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/marten-seemann/qpack v0.3.0 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect github.com/mattn/go-isatty v0.0.16 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -86,6 +83,10 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qtls-go1-18 v0.2.0 // indirect + github.com/quic-go/qtls-go1-19 v0.2.0 // indirect + github.com/quic-go/qtls-go1-20 v0.1.0 // indirect github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect diff --git a/go.sum b/go.sum index ceacc2c..3cf0535 100644 --- a/go.sum +++ b/go.sum @@ -240,16 +240,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4= -github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE= -github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g= -github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI= -github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= -github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE= -github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -327,6 +319,16 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +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/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= +github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= +github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= +github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= +github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA= +github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/internal/util/pht/server.go b/internal/util/pht/server.go index 3394a69..b6d0d8c 100644 --- a/internal/util/pht/server.go +++ b/internal/util/pht/server.go @@ -18,8 +18,8 @@ import ( "github.com/go-gost/core/common/bufpool" "github.com/go-gost/core/logger" xnet "github.com/go-gost/x/internal/net" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" "github.com/rs/xid" ) diff --git a/listener/http3/h3/listener.go b/listener/http3/h3/listener.go index 491cc2f..fe812e9 100644 --- a/listener/http3/h3/listener.go +++ b/listener/http3/h3/listener.go @@ -12,7 +12,7 @@ import ( limiter "github.com/go-gost/x/limiter/traffic/wrapper" metrics "github.com/go-gost/x/metrics/wrapper" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) func init() { diff --git a/listener/http3/listener.go b/listener/http3/listener.go index 3b558e3..60bf7f0 100644 --- a/listener/http3/listener.go +++ b/listener/http3/listener.go @@ -11,8 +11,8 @@ import ( xnet "github.com/go-gost/x/internal/net" mdx "github.com/go-gost/x/metadata" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" ) func init() { diff --git a/listener/icmp/conn.go b/listener/icmp/conn.go index ee1a26c..b59a9ac 100644 --- a/listener/icmp/conn.go +++ b/listener/icmp/conn.go @@ -3,7 +3,7 @@ package quic import ( "net" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) type quicConn struct { diff --git a/listener/icmp/listener.go b/listener/icmp/listener.go index 1e9b0cb..223dde1 100644 --- a/listener/icmp/listener.go +++ b/listener/icmp/listener.go @@ -12,7 +12,7 @@ import ( limiter "github.com/go-gost/x/limiter/traffic/wrapper" metrics "github.com/go-gost/x/metrics/wrapper" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "golang.org/x/net/icmp" ) diff --git a/listener/quic/conn.go b/listener/quic/conn.go index ee1a26c..b59a9ac 100644 --- a/listener/quic/conn.go +++ b/listener/quic/conn.go @@ -3,7 +3,7 @@ package quic import ( "net" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) type quicConn struct { diff --git a/listener/quic/listener.go b/listener/quic/listener.go index 059ca7b..8e22301 100644 --- a/listener/quic/listener.go +++ b/listener/quic/listener.go @@ -13,7 +13,7 @@ import ( limiter "github.com/go-gost/x/limiter/traffic/wrapper" metrics "github.com/go-gost/x/metrics/wrapper" "github.com/go-gost/x/registry" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) func init() {