other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 12:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added experiment to avoid sending the termination signal 

(cherry picked from commit c5357e1f000054ba5836468922cae52a830c8019)
This commit is contained in:
Shelikhoo 2021-04-29 21:28:52 +08:00 committed by 世界
parent ff35118af5
commit 7038bded7b
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/vmess/account.go
View File

@ -18,6 +18,7 @@ type MemoryAccount struct {
Security protocol.SecurityType Security protocol.SecurityType
AuthenticatedLengthExperiment bool AuthenticatedLengthExperiment bool
NoTerminationSignal bool
} }
// AnyValidID returns an ID that is either the main ID or one of the alternative IDs if any. // AnyValidID returns an ID that is either the main ID or one of the alternative IDs if any.
@ -45,14 +46,18 @@ func (a *Account) AsAccount() (protocol.Account, error) {
return nil, newError("failed to parse ID").Base(err).AtError() return nil, newError("failed to parse ID").Base(err).AtError()
} }
protoID := protocol.NewID(id) protoID := protocol.NewID(id)
var AuthenticatedLength bool var AuthenticatedLength, NoTerminationSignal bool
if strings.Contains(a.TestsEnabled, "AuthenticatedLength") { if strings.Contains(a.TestsEnabled, "AuthenticatedLength") {
AuthenticatedLength = true AuthenticatedLength = true
} }
if strings.Contains(a.TestsEnabled, "NoTerminationSignal") {
NoTerminationSignal = true
}
return &MemoryAccount{ return &MemoryAccount{
ID: protoID, ID: protoID,
AlterIDs: protocol.NewAlterIDs(protoID, uint16(a.AlterId)), AlterIDs: protocol.NewAlterIDs(protoID, uint16(a.AlterId)),
Security: a.SecuritySettings.GetSecurityType(), Security: a.SecuritySettings.GetSecurityType(),
AuthenticatedLengthExperiment: AuthenticatedLength, AuthenticatedLengthExperiment: AuthenticatedLength,
NoTerminationSignal: NoTerminationSignal,
}, nil }, nil
} }

4
proxy/vmess/inbound/inbound.go
View File

@ -207,7 +207,9 @@ func transferResponse(timer signal.ActivityUpdater, session *encoding.ServerSess
return err return err
} }
if request.Option.Has(protocol.RequestOptionChunkStream) { account := request.User.Account.(*vmess.MemoryAccount)
if request.Option.Has(protocol.RequestOptionChunkStream) && !account.NoTerminationSignal {
if err := bodyWriter.WriteMultiBuffer(buf.MultiBuffer{}); err != nil { if err := bodyWriter.WriteMultiBuffer(buf.MultiBuffer{}); err != nil {
return err return err
} }

2
proxy/vmess/outbound/outbound.go
View File

@ -168,7 +168,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
return err return err
} }
if request.Option.Has(protocol.RequestOptionChunkStream) { if request.Option.Has(protocol.RequestOptionChunkStream) && !account.NoTerminationSignal {
if err := bodyWriter2.WriteMultiBuffer(buf.MultiBuffer{}); err != nil { if err := bodyWriter2.WriteMultiBuffer(buf.MultiBuffer{}); err != nil {
return err return err
} }