From 452c02e3caef3aa628bb3b812dc8d41024a90207 Mon Sep 17 00:00:00 2001 From: SaeedDev94 Date: Mon, 4 May 2026 13:10:50 -0500 Subject: [PATCH] fix breaking changes for v26.5.3 --- share/generate_share.go | 9 ++++----- share/hysteria_mask.go | 7 ++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/generate_share.go b/share/generate_share.go index f0e04e8c..e787f8e5 100644 --- a/share/generate_share.go +++ b/share/generate_share.go @@ -245,13 +245,12 @@ func streamSettingsQuery(proxy conf.OutboundDetourConfig, link *url.URL) { if len(qp.BrutalDown) > 0 { query = addQuery(query, "down", string(qp.BrutalDown)) } - if qp.UdpHop.PortList != nil { - var portList string - if json.Unmarshal(qp.UdpHop.PortList, &portList) == nil && len(portList) > 0 { - query = addQuery(query, "ports", portList) + if len(qp.UdpHop.PortList.Range) > 0 { + if jsonData, err := json.Marshal(qp.UdpHop.PortList.Range); err == nil { + query = addQuery(query, "ports", string(jsonData)) } } - if qp.UdpHop.Interval != nil { + if qp.UdpHop.Interval.From >= 5 { query = addQuery(query, "hop-interval", strconv.FormatInt(int64(qp.UdpHop.Interval.From), 10)) } } diff --git a/share/hysteria_mask.go b/share/hysteria_mask.go index 6391352f..407e93bb 100644 --- a/share/hysteria_mask.go +++ b/share/hysteria_mask.go @@ -21,15 +21,16 @@ func buildHy2FinalMask(up, down, ports string, hopInterval *int32, obfsType, obf quicParams.BrutalDown = conf.Bandwidth(down) } if ports != "" { + var portList conf.PortList udpHop := conf.UdpHop{} - portListJSON, err := json.Marshal(ports) + err := json.Unmarshal([]byte(ports), &portList) if err != nil { return nil, err } - udpHop.PortList = portListJSON + udpHop.PortList = portList if hopInterval != nil { i := *hopInterval - udpHop.Interval = &conf.Int32Range{Left: i, Right: i, From: i, To: i} + udpHop.Interval = conf.Int32Range{Left: i, Right: i, From: i, To: i} } quicParams.UdpHop = udpHop }