Skip to content

Commit fc23318

Browse files
wwqgtxxwwqgtxx
committed
feat: add receive window config for hy2
#1796
1 parent 192d769 commit fc23318

File tree

7 files changed

+49
-3
lines changed

7 files changed

+49
-3
lines changed

‎adapter/outbound/hysteria2.go

+15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/metacubex/sing-quic/hysteria2"
2323

24+
"github.com/metacubex/quic-go"
2425
"github.com/metacubex/randv2"
2526
M "github.com/sagernet/sing/common/metadata"
2627
)
@@ -62,6 +63,12 @@ type Hysteria2Option struct {
6263
CustomCAString string `proxy:"ca-str,omitempty"`
6364
CWND int `proxy:"cwnd,omitempty"`
6465
UdpMTU int `proxy:"udp-mtu,omitempty"`
66+
67+
// quic-go special config
68+
InitialStreamReceiveWindow uint64 `proxy:"initial-stream-receive-window,omitempty"`
69+
MaxStreamReceiveWindow uint64 `proxy:"max-stream-receive-window,omitempty"`
70+
InitialConnectionReceiveWindow uint64 `proxy:"initial-connection-receive-window,omitempty"`
71+
MaxConnectionReceiveWindow uint64 `proxy:"max-connection-receive-window,omitempty"`
6572
}
6673

6774
func (h *Hysteria2) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
@@ -145,6 +152,13 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
145152
option.UdpMTU = 1200 - 3
146153
}
147154

155+
quicConfig := &quic.Config{
156+
InitialStreamReceiveWindow: option.InitialStreamReceiveWindow,
157+
MaxStreamReceiveWindow: option.MaxStreamReceiveWindow,
158+
InitialConnectionReceiveWindow: option.InitialConnectionReceiveWindow,
159+
MaxConnectionReceiveWindow: option.MaxConnectionReceiveWindow,
160+
}
161+
148162
singDialer := proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer())
149163

150164
clientOptions := hysteria2.ClientOptions{
@@ -156,6 +170,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
156170
SalamanderPassword: salamanderPassword,
157171
Password: option.Password,
158172
TLSConfig: tlsConfig,
173+
QUICConfig: quicConfig,
159174
UDPDisabled: false,
160175
CWND: option.CWND,
161176
UdpMTU: option.UdpMTU,

‎docs/config.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,11 @@ proxies: # socks5
747747
# - h3
748748
# ca: "./my.ca"
749749
# ca-str: "xyz"
750+
###quic-go特殊配置项，不要随意修改除非你知道你在干什么###
751+
# initial-stream-receive-window： 8388608
752+
# max-stream-receive-window： 8388608
753+
# initial-connection-receive-window： 20971520
754+
# max-connection-receive-window： 20971520
750755

751756
# wireguard
752757
- name: "wg"

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759
2424
github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da
2525
github.com/metacubex/randv2 v0.2.0
26-
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4
26+
github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925
2727
github.com/metacubex/sing-shadowsocks v0.2.8
2828
github.com/metacubex/sing-shadowsocks2 v0.2.2
2929
github.com/metacubex/sing-tun v0.4.5

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiL
114114
github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
115115
github.com/metacubex/sing v0.0.0-20241121030428-33b6ebc52000 h1:gUbMXcQXhXGj0vCpCVFTUyIH7TMpD1dpTcNv/MCS+ok=
116116
github.com/metacubex/sing v0.0.0-20241121030428-33b6ebc52000/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
117-
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 h1:HobpULaPK6OoxrHMmgcwLkwwIduXVmwdcznwUfH1GQM=
118-
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
117+
github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925 h1:UkPoRAnoBQMn7IK5qpoIV3OejU15q+rqel3NrbSCFKA=
118+
github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
119119
github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
120120
github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
121121
github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=

‎listener/config/hysteria2.go

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ type Hysteria2Server struct {
2323
CWND int `yaml:"cwnd" json:"cwnd,omitempty"`
2424
UdpMTU int `yaml:"udp-mtu" json:"udp-mtu,omitempty"`
2525
MuxOption sing.MuxOption `yaml:"mux-option" json:"mux-option,omitempty"`
26+
27+
// quic-go special config
28+
InitialStreamReceiveWindow uint64 `yaml:"initial-stream-receive-window" json:"initial-stream-receive-window,omitempty"`
29+
MaxStreamReceiveWindow uint64 `yaml:"max-stream-receive-window" json:"max-stream-receive-window,omitempty"`
30+
InitialConnectionReceiveWindow uint64 `yaml:"initial-connection-receive-window" json:"initial-connection-receive-window,omitempty"`
31+
MaxConnectionReceiveWindow uint64 `yaml:"max-connection-receive-window" json:"max-connection-receive-window,omitempty"`
2632
}
2733

2834
func (h Hysteria2Server) String() string {

‎listener/inbound/hysteria2.go

+11
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ type Hysteria2Option struct {
2323
CWND int `inbound:"cwnd,omitempty"`
2424
UdpMTU int `inbound:"udp-mtu,omitempty"`
2525
MuxOption MuxOption `inbound:"mux-option,omitempty"`
26+
27+
// quic-go special config
28+
InitialStreamReceiveWindow uint64 `inbound:"initial-stream-receive-window,omitempty"`
29+
MaxStreamReceiveWindow uint64 `inbound:"max-stream-receive-window,omitempty"`
30+
InitialConnectionReceiveWindow uint64 `inbound:"initial-connection-receive-window,omitempty"`
31+
MaxConnectionReceiveWindow uint64 `inbound:"max-connection-receive-window,omitempty"`
2632
}
2733

2834
func (o Hysteria2Option) Equal(config C.InboundConfig) bool {
@@ -61,6 +67,11 @@ func NewHysteria2(options *Hysteria2Option) (*Hysteria2, error) {
6167
CWND: options.CWND,
6268
UdpMTU: options.UdpMTU,
6369
MuxOption: options.MuxOption.Build(),
70+
// quic-go special config
71+
InitialStreamReceiveWindow: options.InitialStreamReceiveWindow,
72+
MaxStreamReceiveWindow: options.MaxStreamReceiveWindow,
73+
InitialConnectionReceiveWindow: options.InitialConnectionReceiveWindow,
74+
MaxConnectionReceiveWindow: options.MaxConnectionReceiveWindow,
6475
},
6576
}, nil
6677
}

‎listener/sing_hysteria2/server.go

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
"github.com/metacubex/sing-quic/hysteria2"
2424

25+
"github.com/metacubex/quic-go"
2526
E "github.com/sagernet/sing/common/exceptions"
2627
)
2728

@@ -110,13 +111,21 @@ func New(config LC.Hysteria2Server, tunnel C.Tunnel, additions ...inbound.Additi
110111
config.UdpMTU = 1200 - 3
111112
}
112113

114+
quicConfig := &quic.Config{
115+
InitialStreamReceiveWindow: config.InitialStreamReceiveWindow,
116+
MaxStreamReceiveWindow: config.MaxStreamReceiveWindow,
117+
InitialConnectionReceiveWindow: config.InitialConnectionReceiveWindow,
118+
MaxConnectionReceiveWindow: config.MaxConnectionReceiveWindow,
119+
}
120+
113121
service, err := hysteria2.NewService[string](hysteria2.ServiceOptions{
114122
Context: context.Background(),
115123
Logger: log.SingLogger,
116124
SendBPS: outbound.StringToBps(config.Up),
117125
ReceiveBPS: outbound.StringToBps(config.Down),
118126
SalamanderPassword: salamanderPassword,
119127
TLSConfig: tlsConfig,
128+
QUICConfig: quicConfig,
120129
IgnoreClientBandwidth: config.IgnoreClientBandwidth,
121130
Handler: h,
122131
MasqueradeHandler: masqueradeHandler,

0 commit comments

Comments
 (0)