SagerNet/sing-quic
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-quic.git synced 2025-04-04 20:37:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update the behavior of ignore_client_bandwidth

Browse source
This commit is contained in:
世界 2025-01-01 13:07:12 +08:00
parent 06d01d20a7
commit da0a8689f2
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hysteria2/service.go
View file

@ -188,7 +188,7 @@ func (s *serverSession[U]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
protocol.AuthResponseToHeader(w.Header(), protocol.AuthResponse{ protocol.AuthResponseToHeader(w.Header(), protocol.AuthResponse{
UDPEnabled: !s.udpDisabled, UDPEnabled: !s.udpDisabled,
Rx: s.receiveBPS, Rx: s.receiveBPS,
RxAuto: s.ignoreClientBandwidth, RxAuto: s.receiveBPS == 0 && s.ignoreClientBandwidth,
}) })
w.WriteHeader(protocol.StatusAuthOK) w.WriteHeader(protocol.StatusAuthOK)
return return
@ -201,7 +201,12 @@ func (s *serverSession[U]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
s.authUser = user s.authUser = user
s.authenticated = true s.authenticated = true
if !s.ignoreClientBandwidth && request.Rx > 0 { var rxAuto bool
if s.receiveBPS > 0 && s.ignoreClientBandwidth && request.Rx == 0 {
s.logger.Debug("process connection from ", r.RemoteAddr, ": BBR disabled by server")
s.masqueradeHandler.ServeHTTP(w, r)
return
} else if !(s.receiveBPS == 0 && s.ignoreClientBandwidth) && request.Rx > 0 {
rx := request.Rx rx := request.Rx
if s.sendBPS > 0 && rx > s.sendBPS { if s.sendBPS > 0 && rx > s.sendBPS {
rx = s.sendBPS rx = s.sendBPS
@ -217,11 +222,12 @@ func (s *serverSession[U]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
congestion.ByteCount(s.quicConn.Config().InitialPacketSize), congestion.ByteCount(s.quicConn.Config().InitialPacketSize),
congestion.ByteCount(congestion_meta1.InitialCongestionWindow), congestion.ByteCount(congestion_meta1.InitialCongestionWindow),
)) ))
rxAuto = true
} }
protocol.AuthResponseToHeader(w.Header(), protocol.AuthResponse{ protocol.AuthResponseToHeader(w.Header(), protocol.AuthResponse{
UDPEnabled: !s.udpDisabled, UDPEnabled: !s.udpDisabled,
Rx: s.receiveBPS, Rx: s.receiveBPS,
RxAuto: s.ignoreClientBandwidth, RxAuto: rxAuto,
}) })
w.WriteHeader(protocol.StatusAuthOK) w.WriteHeader(protocol.StatusAuthOK)
if s.ctx.Done() != nil { if s.ctx.Done() != nil {