dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

quicParams config: Better unmarshaling udpHop (#6068)

Browse Source 
Fixes https://github.com/XTLS/Xray-core/issues/6067#issuecomment-4365869178
This commit is contained in:
LjhAUMEM
2026-05-03 19:04:54 +08:00
committed by GitHub
parent 4951994ebe
commit 15968585f3
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
infra/conf/transport_internet.go
View File

@@ -497,8 +497,8 @@ func (b Bandwidth) Bps() (uint64, error) {
} }
type UdpHop struct { type UdpHop struct {
PortList json.RawMessage `json:"ports"` PortList PortList `json:"ports"`
Interval *Int32Range `json:"interval"` Interval Int32Range `json:"interval"`
} }
type Masquerade struct { type Masquerade struct {
@@ -2142,18 +2142,7 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) {
return nil, errors.New("unknown congestion control: ", c.FinalMask.QuicParams.Congestion, ", valid values: reno, bbr, brutal, force-brutal") return nil, errors.New("unknown congestion control: ", c.FinalMask.QuicParams.Congestion, ", valid values: reno, bbr, brutal, force-brutal")
} }
var hop *PortList if (c.FinalMask.QuicParams.UdpHop.Interval.From != 0 && c.FinalMask.QuicParams.UdpHop.Interval.From < 5) || (c.FinalMask.QuicParams.UdpHop.Interval.To != 0 && c.FinalMask.QuicParams.UdpHop.Interval.To < 5) {
if err := json.Unmarshal(c.FinalMask.QuicParams.UdpHop.PortList, &hop); err != nil {
hop = &PortList{}
}
var inertvalMin, inertvalMax int64
if c.FinalMask.QuicParams.UdpHop.Interval != nil {
inertvalMin = int64(c.FinalMask.QuicParams.UdpHop.Interval.From)
inertvalMax = int64(c.FinalMask.QuicParams.UdpHop.Interval.To)
}
if (inertvalMin != 0 && inertvalMin < 5) || (inertvalMax != 0 && inertvalMax < 5) {
return nil, errors.New("Interval must be at least 5") return nil, errors.New("Interval must be at least 5")
} }
@@ -2190,9 +2179,9 @@ func (c *StreamConfig) Build() (*internet.StreamConfig, error) {
BrutalUp: up, BrutalUp: up,
BrutalDown: down, BrutalDown: down,
UdpHop: &internet.UdpHop{ UdpHop: &internet.UdpHop{
Ports: hop.Build().Ports(), Ports: c.FinalMask.QuicParams.UdpHop.PortList.Build().Ports(),
IntervalMin: inertvalMin, IntervalMin: int64(c.FinalMask.QuicParams.UdpHop.Interval.From),
IntervalMax: inertvalMax, IntervalMax: int64(c.FinalMask.QuicParams.UdpHop.Interval.To),
}, },
InitStreamReceiveWindow: c.FinalMask.QuicParams.InitStreamReceiveWindow, InitStreamReceiveWindow: c.FinalMask.QuicParams.InitStreamReceiveWindow,
MaxStreamReceiveWindow: c.FinalMask.QuicParams.MaxStreamReceiveWindow, MaxStreamReceiveWindow: c.FinalMask.QuicParams.MaxStreamReceiveWindow,