Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
f40cbe1
hysteria2
Jan 9, 2026
bf7a274
fix remote
Jan 9, 2026
a828c8d
infra err
Jan 9, 2026
13603cf
endmask
Jan 9, 2026
71bec5b
bbr logic
Jan 9, 2026
9332b8c
endmask manager
Jan 10, 2026
219a0fa
udphop
Jan 10, 2026
84c1cc2
Merge remote-tracking branch 'origin/main' into hysteria2
Jan 10, 2026
9511b70
fix infra
Jan 10, 2026
55669ee
fix infra
Jan 10, 2026
1c1fe51
udphop used as the outermost layer
Jan 10, 2026
15ca223
restore unmodified udphop with ip setup
Jan 10, 2026
ee6016f
dial using hop address
Jan 10, 2026
57ca00a
allow keepalive to be zero
Jan 11, 2026
43eaa99
refactor endmask
Jan 11, 2026
724879d
udpmask
Jan 11, 2026
3e4c306
portlist
Jan 11, 2026
42e3fb0
infra: udpmask loader
Jan 11, 2026
aa686a5
fix infra
Jan 12, 2026
c1e0461
bump 2.7.0
Jan 12, 2026
7b70db9
Merge remote-tracking branch 'origin/main' into hysteria2
Jan 12, 2026
4f4e2b0
Remove inactive clients only
Jan 12, 2026
19314c8
close raw
Jan 12, 2026
b9369be
refactor clientManager
Jan 12, 2026
3e062d6
switch quic-go import to apernet version
Jan 12, 2026
2467fa8
go mod
Jan 12, 2026
d1db918
rename hysteria2 to hysteria
Jan 12, 2026
173fea7
enableDatagram
Jan 13, 2026
844bea2
finalmask
Jan 13, 2026
53bf5a9
transport version
Jan 13, 2026
93061c4
refactor json structure
Jan 13, 2026
9f01409
fix infra
Jan 13, 2026
161b21a
hysteria2
Jan 9, 2026
a45786e
fix remote
Jan 9, 2026
6f336ca
infra err
Jan 9, 2026
b7fceab
endmask
Jan 9, 2026
cc85ce6
bbr logic
Jan 9, 2026
cb648be
endmask manager
Jan 10, 2026
7c83d2c
udphop
Jan 10, 2026
8993ffb
fix infra
Jan 10, 2026
0bcc8bf
fix infra
Jan 10, 2026
031ce6c
udphop used as the outermost layer
Jan 10, 2026
acd2dbc
restore unmodified udphop with ip setup
Jan 10, 2026
8f23bff
dial using hop address
Jan 10, 2026
a882160
allow keepalive to be zero
Jan 11, 2026
8e1228f
refactor endmask
Jan 11, 2026
58a94a3
udpmask
Jan 11, 2026
aa067cc
portlist
Jan 11, 2026
e155cfb
infra: udpmask loader
Jan 11, 2026
bed0720
fix infra
Jan 12, 2026
17a25f5
bump 2.7.0
Jan 12, 2026
49bdb7e
Remove inactive clients only
Jan 12, 2026
40d4aca
close raw
Jan 12, 2026
b27b6b0
refactor clientManager
Jan 12, 2026
0be12b3
switch quic-go import to apernet version
Jan 12, 2026
6370eb9
go mod
Jan 12, 2026
d0471d3
rename hysteria2 to hysteria
Jan 12, 2026
88dbb46
enableDatagram
Jan 13, 2026
2d911bb
finalmask
Jan 13, 2026
8e223f6
transport version
Jan 13, 2026
ea7ec61
refactor json structure
Jan 13, 2026
e09e875
fix infra
Jan 13, 2026
b39c3bf
Merge branch 'hysteria2' of https://github.com/LjhAUMEM/Xray-core int…
Jan 13, 2026
ee9ade0
go mod
Jan 13, 2026
a7954d2
udpmasks to array
Jan 13, 2026
0c2c84b
Merge branch 'hysteria2' of https://github.com/LjhAUMEM/Xray-core int…
Jan 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/dns/nameserver_quic.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/quic-go/quic-go"
"github.com/apernet/quic-go"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/log"
Expand Down
10 changes: 10 additions & 0 deletions common/net/port.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ func PortListFromProto(l *PortList) MemoryPortList {
return mpl
}

func (l *PortList) Ports() []uint32 {
var ports []uint32
for _, r := range l.Range {
for i := uint32(r.From); i <= uint32(r.To); i++ {
ports = append(ports, i)
}
}
return ports
}

func (mpl MemoryPortList) Contains(port Port) bool {
for _, pr := range mpl {
if pr.Contains(port) {
Expand Down
2 changes: 1 addition & 1 deletion common/protocol/quic/sniff.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"encoding/binary"
"io"

"github.com/quic-go/quic-go/quicvarint"
"github.com/apernet/quic-go/quicvarint"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/xtls/xray-core
go 1.25.5

require (
github.com/apernet/quic-go v0.57.2-0.20260111184307-eec823306178
github.com/cloudflare/circl v1.6.2
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
github.com/golang/mock v1.7.0-rc.1
Expand All @@ -11,7 +12,6 @@ require (
github.com/miekg/dns v1.1.70
github.com/pelletier/go-toml v1.9.5
github.com/pires/go-proxyproto v0.8.1
github.com/quic-go/quic-go v0.58.0
github.com/refraction-networking/utls v1.8.1
github.com/sagernet/sing v0.5.1
github.com/sagernet/sing-shadowsocks v0.2.7
Expand All @@ -22,6 +22,7 @@ require (
github.com/xtls/reality v0.0.0-20251014195629-e4eec4520535
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
golang.org/x/crypto v0.47.0
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/net v0.49.0
golang.org/x/sync v0.19.0
golang.org/x/sys v0.40.0
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/apernet/quic-go v0.57.2-0.20260111184307-eec823306178 h1:bSq8n+gX4oO/qnM3MKf4kroW75n+phO9Qp6nigJKZ1E=
github.com/apernet/quic-go v0.57.2-0.20260111184307-eec823306178/go.mod h1:N1WIjPphkqs4efXWuyDNQ6OjjIK04vM3h+bEgwV+eVU=
github.com/cloudflare/circl v1.6.2 h1:hL7VBpHHKzrV5WTfHCaBsgx/HGbBYlgrwvNXEVDYYsQ=
github.com/cloudflare/circl v1.6.2/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down Expand Up @@ -50,8 +52,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
github.com/quic-go/quic-go v0.58.0 h1:ggY2pvZaVdB9EyojxL1p+5mptkuHyX5MOSv4dgWF4Ug=
github.com/quic-go/quic-go v0.58.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
github.com/refraction-networking/utls v1.8.1 h1:yNY1kapmQU8JeM1sSw2H2asfTIwWxIkrMJI0pRUOCAo=
github.com/refraction-networking/utls v1.8.1/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
Expand Down Expand Up @@ -97,6 +97,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
Expand Down
23 changes: 23 additions & 0 deletions infra/conf/hysteria.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package conf

import (
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/proxy/hysteria"
"google.golang.org/protobuf/proto"
)

type HysteriaClientConfig struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
}

func (c *HysteriaClientConfig) Build() (proto.Message, error) {
config := new(hysteria.ClientConfig)

config.Server = &protocol.ServerEndpoint{
Address: c.Address.Build(),
Port: uint32(c.Port),
}

return config, nil
}
Loading
Loading