chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add brutal debug option for Hysteria2

Browse Source
This commit is contained in:
世界 2023-10-08 12:45:15 +08:00
parent e453343a56
commit 8670ab241a
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
11 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/configuration/inbound/hysteria2.md
View File

@ -20,8 +20,9 @@
}
],
"ignore_client_bandwidth": false,
"tls": {},
"masquerade": "",
"tls": {}
"brutal_debug": false
}
```
@ -67,6 +68,12 @@ Commands the client to use the BBR flow control algorithm instead of Hysteria CC
Conflict with `up_mbps` and `down_mbps`.
#### tls
==Required==
TLS configuration, see [TLS](/configuration/shared/tls/#inbound).
#### masquerade
HTTP3 server behavior when authentication fails.
@ -78,8 +85,6 @@ HTTP3 server behavior when authentication fails.
A 404 page will be returned if empty.
#### tls
#### brutal_debug
==Required==
TLS configuration, see [TLS](/configuration/shared/tls/#inbound).
Enable debug information logging for Hysteria Brutal CC.

15
docs/configuration/inbound/hysteria2.zh.md
View File

@ -20,8 +20,9 @@
}
],
"ignore_client_bandwidth": false,
"tls": {},
"masquerade": "",
"tls": {}
"brutal_debug": false
}
```
@ -65,6 +66,12 @@ Hysteria 用户
与 `up_mbps` 和 `down_mbps` 冲突。
#### tls
==必填==
TLS 配置, 参阅 [TLS](/zh/configuration/shared/tls/#inbound)。
#### masquerade
HTTP3 服务器认证失败时的行为。
@ -76,8 +83,6 @@ HTTP3 服务器认证失败时的行为。
如果为空，则返回 404 页。
#### tls
#### brutal_debug
==必填==
TLS 配置, 参阅 [TLS](/zh/configuration/shared/tls/#inbound)。
启用 Hysteria Brutal CC 的调试信息日志记录。

5
docs/configuration/outbound/hysteria2.md
View File

@ -16,6 +16,7 @@
"password": "goofy_ahh_password",
"network": "tcp",
"tls": {},
"brutal_debug": false,
... // Dial Fields
}
@ -73,6 +74,10 @@ Both is enabled by default.
TLS configuration, see [TLS](/configuration/shared/tls/#outbound).
#### brutal_debug
Enable debug information logging for Hysteria Brutal CC.
### Dial Fields
See [Dial Fields](/configuration/shared/dial) for details.

4
docs/configuration/outbound/hysteria2.zh.md
View File

@ -16,6 +16,7 @@
"password": "goofy_ahh_password",
"network": "tcp",
"tls": {},
"brutal_debug": false,
... // 拨号字段
}
@ -73,6 +74,9 @@ QUIC 流量混淆器密码.
TLS 配置, 参阅 [TLS](/zh/configuration/shared/tls/#outbound)。
#### brutal_debug
启用 Hysteria Brutal CC 的调试信息日志记录。
### 拨号字段

2
go.mod
View File

@ -28,7 +28,7 @@ require (
github.com/sagernet/sing v0.2.14-0.20231008040725-e690cb9a7ad2
github.com/sagernet/sing-dns v0.1.10
github.com/sagernet/sing-mux v0.1.3
github.com/sagernet/sing-quic v0.1.3-0.20231008041725-daf7c394c992
github.com/sagernet/sing-quic v0.1.3-0.20231008043106-a107947d1ed5
github.com/sagernet/sing-shadowsocks v0.2.5
github.com/sagernet/sing-shadowsocks2 v0.1.4
github.com/sagernet/sing-shadowtls v0.1.4

4
go.sum
View File

@ -114,8 +114,8 @@ github.com/sagernet/sing-dns v0.1.10 h1:iIU7nRBlUYj+fF2TaktGIvRiTFFrHwSMedLQsvlT
github.com/sagernet/sing-dns v0.1.10/go.mod h1:vtUimtf7Nq9EdvD5WTpfCr69KL1M7bcgOVKiYBiAY/c=
github.com/sagernet/sing-mux v0.1.3 h1:fAf7PZa2A55mCeh0KKM02f1k2Y4vEmxuZZ/51ahkkLA=
github.com/sagernet/sing-mux v0.1.3/go.mod h1:wGeIeiiFLx4HUM5LAg65wrNZ/X1muOimqK0PEhNbPi0=
github.com/sagernet/sing-quic v0.1.3-0.20231008041725-daf7c394c992 h1:GOnLdLz0KWywsR1q+IW/AQ5NoEDjz94z9ogd5CHVrXc=
github.com/sagernet/sing-quic v0.1.3-0.20231008041725-daf7c394c992/go.mod h1:1M7xP4802K9Kz6BQ7LlA7UeCapWvWlH1Htmk2bAqkWc=
github.com/sagernet/sing-quic v0.1.3-0.20231008043106-a107947d1ed5 h1:ENdA0N/fjXoK27FNIgJyFu4EkiaFAAkO5QNRCCq1LmE=
github.com/sagernet/sing-quic v0.1.3-0.20231008043106-a107947d1ed5/go.mod h1:1M7xP4802K9Kz6BQ7LlA7UeCapWvWlH1Htmk2bAqkWc=
github.com/sagernet/sing-shadowsocks v0.2.5 h1:qxIttos4xu6ii7MTVJYA8EFQR7Q3KG6xMqmLJIFtBaY=
github.com/sagernet/sing-shadowsocks v0.2.5/go.mod h1:MGWGkcU2xW2G2mfArT9/QqpVLOGU+dBaahZCtPHdt7A=
github.com/sagernet/sing-shadowsocks2 v0.1.4 h1:vht2M8t3m5DTgXR2j24KbYOygG5aOp+MUhpQnAux728=

2
inbound/hysteria.go
View File

@ -221,7 +221,7 @@ func (h *Hysteria) accept(ctx context.Context, conn quic.Connection) error {
if err != nil {
return err
}
conn.SetCongestionControl(hyCC.NewBrutalSender(serverSendBPS))
conn.SetCongestionControl(hyCC.NewBrutalSender(serverSendBPS, false, nil))
go h.udpRecvLoop(conn)
for {
var stream quic.Stream

1
inbound/hysteria2.go
View File

@ -89,6 +89,7 @@ func NewHysteria2(ctx context.Context, router adapter.Router, logger log.Context
service, err := hysteria2.NewService[int](hysteria2.ServiceOptions{
Context: ctx,
Logger: logger,
BrutalDebug: options.BrutalDebug,
SendBPS: uint64(options.UpMbps * hysteria.MbpsToBps),
ReceiveBPS: uint64(options.DownMbps * hysteria.MbpsToBps),
SalamanderPassword: salamanderPassword,

2
option/hysteria2.go
View File

@ -9,6 +9,7 @@ type Hysteria2InboundOptions struct {
IgnoreClientBandwidth bool `json:"ignore_client_bandwidth,omitempty"`
TLS *InboundTLSOptions `json:"tls,omitempty"`
Masquerade string `json:"masquerade,omitempty"`
BrutalDebug bool `json:"brutal_debug,omitempty"`
}
type Hysteria2Obfs struct {
@ -30,4 +31,5 @@ type Hysteria2OutboundOptions struct {
Password string `json:"password,omitempty"`
Network NetworkList `json:"network,omitempty"`
TLS *OutboundTLSOptions `json:"tls,omitempty"`
BrutalDebug bool `json:"brutal_debug,omitempty"`
}

2
outbound/hysteria.go
View File

@ -206,7 +206,7 @@ func (h *Hysteria) offerNew(ctx context.Context) (quic.Connection, error) {
packetConn.Close()
return nil, E.New("remote error: ", serverHello.Message)
}
quicConn.SetCongestionControl(hyCC.NewBrutalSender(serverHello.RecvBPS))
quicConn.SetCongestionControl(hyCC.NewBrutalSender(serverHello.RecvBPS, false, nil))
h.conn = quicConn
h.rawConn = udpConn
return quicConn, nil

2
outbound/hysteria2.go
View File

@ -61,6 +61,8 @@ func NewHysteria2(ctx context.Context, router adapter.Router, logger log.Context
client, err := hysteria2.NewClient(hysteria2.ClientOptions{
Context: ctx,
Dialer: outboundDialer,
Logger: logger,
BrutalDebug: options.BrutalDebug,
ServerAddress: options.ServerOptions.Build(),
SendBPS: uint64(options.UpMbps * hysteria.MbpsToBps),
ReceiveBPS: uint64(options.DownMbps * hysteria.MbpsToBps),