v2ray-core: update to v5.3.0
This commit is contained in:
sbwml
parent
bd6dc500e6
commit
9882089518
@ -5,12 +5,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=v2ray-core
|
PKG_NAME:=v2ray-core
|
||||||
PKG_VERSION:=5.2.1
|
PKG_VERSION:=5.3.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
|
||||||
PKG_HASH:=97bc872e798fed51c23c39f8f63ee25984658e2b252b0ec2c8ec469c00a4d77a
|
PKG_HASH:=8e97e2647cb1dee8aa7e71df276c56d74258b2d97bb490a362afa84bdf1b9e25
|
||||||
|
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_LICENSE_FILES:=LICENSE
|
PKG_LICENSE_FILES:=LICENSE
|
||||||
|
|||||||
@ -1,279 +0,0 @@
|
|||||||
From 69799e6a1bc176f1b55a79bcbd22b99bce2ca8e2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?=
|
|
||||||
<autmaple@protonmail.com>
|
|
||||||
Date: Fri, 3 Feb 2023 17:08:53 +0800
|
|
||||||
Subject: [PATCH] go1.20
|
|
||||||
|
|
||||||
---
|
|
||||||
.github/workflows/release.yml | 4 +--
|
|
||||||
app/dns/nameserver_quic.go | 2 +-
|
|
||||||
common/protocol/quic/qtls_go119.go | 5 ++--
|
|
||||||
.../quic/{qtls_go118.go => qtls_go120.go} | 5 ++--
|
|
||||||
common/protocol/quic/sniff.go | 2 +-
|
|
||||||
go.mod | 15 +++++-----
|
|
||||||
go.sum | 30 ++++++++++---------
|
|
||||||
transport/internet/quic/conn.go | 2 +-
|
|
||||||
transport/internet/quic/dialer.go | 2 +-
|
|
||||||
transport/internet/quic/hub.go | 2 +-
|
|
||||||
10 files changed, 35 insertions(+), 34 deletions(-)
|
|
||||||
rename common/protocol/quic/{qtls_go118.go => qtls_go120.go} (73%)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
|
|
||||||
index 4e9f0122..b09588cd 100644
|
|
||||||
--- a/.github/workflows/release.yml
|
|
||||||
+++ b/.github/workflows/release.yml
|
|
||||||
@@ -119,7 +119,7 @@ jobs:
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v3
|
|
||||||
with:
|
|
||||||
- go-version: ^1.19
|
|
||||||
+ go-version: ^1.20
|
|
||||||
|
|
||||||
- name: Get project dependencies
|
|
||||||
run: go mod download
|
|
||||||
@@ -187,7 +187,7 @@ jobs:
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v3
|
|
||||||
with:
|
|
||||||
- go-version: ^1.18
|
|
||||||
+ go-version: ^1.20
|
|
||||||
|
|
||||||
- uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go
|
|
||||||
index bd81153a..1b82e27b 100644
|
|
||||||
--- a/app/dns/nameserver_quic.go
|
|
||||||
+++ b/app/dns/nameserver_quic.go
|
|
||||||
@@ -9,7 +9,7 @@ import (
|
|
||||||
"sync/atomic"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
- "github.com/lucas-clemente/quic-go"
|
|
||||||
+ "github.com/quic-go/quic-go"
|
|
||||||
"golang.org/x/net/dns/dnsmessage"
|
|
||||||
"golang.org/x/net/http2"
|
|
||||||
|
|
||||||
diff --git a/common/protocol/quic/qtls_go119.go b/common/protocol/quic/qtls_go119.go
|
|
||||||
index 98ff28d4..4ab25af8 100644
|
|
||||||
--- a/common/protocol/quic/qtls_go119.go
|
|
||||||
+++ b/common/protocol/quic/qtls_go119.go
|
|
||||||
@@ -1,12 +1,11 @@
|
|
||||||
-//go:build go1.19
|
|
||||||
-// +build go1.19
|
|
||||||
+//go:build go1.19 && !go1.20
|
|
||||||
|
|
||||||
package quic
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/cipher"
|
|
||||||
|
|
||||||
- "github.com/marten-seemann/qtls-go1-19"
|
|
||||||
+ "github.com/quic-go/qtls-go1-19"
|
|
||||||
)
|
|
||||||
|
|
||||||
type (
|
|
||||||
diff --git a/common/protocol/quic/qtls_go118.go b/common/protocol/quic/qtls_go120.go
|
|
||||||
similarity index 73%
|
|
||||||
rename from common/protocol/quic/qtls_go118.go
|
|
||||||
rename to common/protocol/quic/qtls_go120.go
|
|
||||||
index 63546a4b..e182c75b 100644
|
|
||||||
--- a/common/protocol/quic/qtls_go118.go
|
|
||||||
+++ b/common/protocol/quic/qtls_go120.go
|
|
||||||
@@ -1,12 +1,11 @@
|
|
||||||
-//go:build go1.18 && !go1.19
|
|
||||||
-// +build go1.18,!go1.19
|
|
||||||
+//go:build go1.20
|
|
||||||
|
|
||||||
package quic
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/cipher"
|
|
||||||
|
|
||||||
- "github.com/marten-seemann/qtls-go1-18"
|
|
||||||
+ "github.com/quic-go/qtls-go1-20"
|
|
||||||
)
|
|
||||||
|
|
||||||
type (
|
|
||||||
diff --git a/common/protocol/quic/sniff.go b/common/protocol/quic/sniff.go
|
|
||||||
index d0421309..a4fa7b9e 100644
|
|
||||||
--- a/common/protocol/quic/sniff.go
|
|
||||||
+++ b/common/protocol/quic/sniff.go
|
|
||||||
@@ -7,7 +7,7 @@ import (
|
|
||||||
"encoding/binary"
|
|
||||||
"io"
|
|
||||||
|
|
||||||
- "github.com/lucas-clemente/quic-go/quicvarint"
|
|
||||||
+ "github.com/quic-go/quic-go/quicvarint"
|
|
||||||
"golang.org/x/crypto/hkdf"
|
|
||||||
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common"
|
|
||||||
diff --git a/go.mod b/go.mod
|
|
||||||
index 393bdd90..1991602a 100644
|
|
||||||
--- a/go.mod
|
|
||||||
+++ b/go.mod
|
|
||||||
@@ -12,13 +12,13 @@ require (
|
|
||||||
github.com/google/go-cmp v0.5.9
|
|
||||||
github.com/gorilla/websocket v1.5.0
|
|
||||||
github.com/jhump/protoreflect v1.14.0
|
|
||||||
- github.com/lucas-clemente/quic-go v0.31.1
|
|
||||||
- github.com/marten-seemann/qtls-go1-18 v0.1.3
|
|
||||||
- github.com/marten-seemann/qtls-go1-19 v0.1.1
|
|
||||||
github.com/miekg/dns v1.1.50
|
|
||||||
github.com/mustafaturan/bus v1.0.2
|
|
||||||
github.com/pelletier/go-toml v1.9.5
|
|
||||||
github.com/pires/go-proxyproto v0.6.2
|
|
||||||
+ github.com/quic-go/qtls-go1-19 v0.2.0
|
|
||||||
+ github.com/quic-go/qtls-go1-20 v0.1.0
|
|
||||||
+ github.com/quic-go/quic-go v0.32.0
|
|
||||||
github.com/refraction-networking/utls v1.2.0
|
|
||||||
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb
|
|
||||||
github.com/stretchr/testify v1.8.1
|
|
||||||
@@ -30,7 +30,7 @@ require (
|
|
||||||
go4.org/netipx v0.0.0-20220812043211-3cc044ffd68d
|
|
||||||
golang.org/x/crypto v0.4.0
|
|
||||||
golang.org/x/net v0.4.0
|
|
||||||
- golang.org/x/sync v0.0.0-20220907140024-f12130a52804
|
|
||||||
+ golang.org/x/sync v0.1.0
|
|
||||||
golang.org/x/sys v0.3.0
|
|
||||||
google.golang.org/grpc v1.51.0
|
|
||||||
google.golang.org/protobuf v1.28.1
|
|
||||||
@@ -63,13 +63,14 @@ require (
|
|
||||||
github.com/pion/sctp v1.7.6 // indirect
|
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
|
||||||
+ github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
|
|
||||||
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
|
|
||||||
github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 // indirect
|
|
||||||
github.com/xtaci/smux v1.5.15 // indirect
|
|
||||||
- golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
|
|
||||||
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
|
|
||||||
+ golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
|
|
||||||
+ golang.org/x/mod v0.6.0 // indirect
|
|
||||||
golang.org/x/text v0.5.0 // indirect
|
|
||||||
- golang.org/x/tools v0.1.12 // indirect
|
|
||||||
+ golang.org/x/tools v0.2.0 // indirect
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
|
||||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
|
|
||||||
)
|
|
||||||
diff --git a/go.sum b/go.sum
|
|
||||||
index 5d4ce92e..e285eccb 100644
|
|
||||||
--- a/go.sum
|
|
||||||
+++ b/go.sum
|
|
||||||
@@ -193,16 +193,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
|
||||||
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/lunixbochs/struc v0.0.0-20190916212049-a5c72983bc42/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
|
|
||||||
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
|
|
||||||
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
|
|
||||||
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
|
||||||
-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-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
|
||||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
|
||||||
@@ -267,6 +261,14 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
|
|
||||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
|
||||||
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
|
||||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
|
||||||
+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/refraction-networking/utls v1.2.0 h1:U5f8wkij2NVinfLuJdFP3gCMwIHs+EzvhxmYdXgiapo=
|
|
||||||
github.com/refraction-networking/utls v1.2.0/go.mod h1:NPq+cVqzH7D1BeOkmOcb5O/8iVewAsiVt2x1/eO0hgQ=
|
|
||||||
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
|
|
||||||
@@ -361,8 +363,8 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL
|
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
|
||||||
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
|
|
||||||
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
|
|
||||||
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
|
|
||||||
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
|
|
||||||
+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/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
|
||||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
|
||||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
|
||||||
@@ -378,8 +380,8 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
|
|
||||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
|
|
||||||
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
|
||||||
+golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
|
|
||||||
+golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
|
|
||||||
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-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
@@ -414,8 +416,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
|
|
||||||
-golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
|
|
||||||
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
@@ -481,8 +483,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
|
|
||||||
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
|
|
||||||
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
|
||||||
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
|
||||||
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
|
|
||||||
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
|
||||||
+golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
|
|
||||||
+golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
|
|
||||||
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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
diff --git a/transport/internet/quic/conn.go b/transport/internet/quic/conn.go
|
|
||||||
index e24fd50b..492c2428 100644
|
|
||||||
--- a/transport/internet/quic/conn.go
|
|
||||||
+++ b/transport/internet/quic/conn.go
|
|
||||||
@@ -7,7 +7,7 @@ import (
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
- "github.com/lucas-clemente/quic-go"
|
|
||||||
+ "github.com/quic-go/quic-go"
|
|
||||||
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common"
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common/buf"
|
|
||||||
diff --git a/transport/internet/quic/dialer.go b/transport/internet/quic/dialer.go
|
|
||||||
index 8a52a012..f3e14294 100644
|
|
||||||
--- a/transport/internet/quic/dialer.go
|
|
||||||
+++ b/transport/internet/quic/dialer.go
|
|
||||||
@@ -5,7 +5,7 @@ import (
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
- "github.com/lucas-clemente/quic-go"
|
|
||||||
+ "github.com/quic-go/quic-go"
|
|
||||||
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common"
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common/net"
|
|
||||||
diff --git a/transport/internet/quic/hub.go b/transport/internet/quic/hub.go
|
|
||||||
index bdd004e7..41bae59e 100644
|
|
||||||
--- a/transport/internet/quic/hub.go
|
|
||||||
+++ b/transport/internet/quic/hub.go
|
|
||||||
@@ -4,7 +4,7 @@ import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
- "github.com/lucas-clemente/quic-go"
|
|
||||||
+ "github.com/quic-go/quic-go"
|
|
||||||
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common"
|
|
||||||
"github.com/v2fly/v2ray-core/v5/common/net"
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user