enoch/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-17 23:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sniffer: Fix potential infinite loop (#4726)

Browse Source 
Co-authored-by: 风扇滑翔翼 <Fangliding.fshxy@outlook.com>
This commit is contained in:
patterniha 2025-05-16 15:34:54 +03:30 committed by GitHub
parent 09d84c42e9
commit bb0e561caf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/dispatcher/default.go
View File

@ -371,7 +371,10 @@ func sniffer(ctx context.Context, cReader *cachedReader, metadataOnly bool, netw
return nil, ctx.Err() return nil, ctx.Err()
default: default:
cachingStartingTimeStamp := time.Now() cachingStartingTimeStamp := time.Now()
cacheErr := cReader.Cache(payload, cacheDeadline) err := cReader.Cache(payload, cacheDeadline)
if err != nil {
return nil, err
}
cachingTimeElapsed := time.Since(cachingStartingTimeStamp) cachingTimeElapsed := time.Since(cachingStartingTimeStamp)
cacheDeadline -= cachingTimeElapsed cacheDeadline -= cachingTimeElapsed
@ -381,12 +384,12 @@ func sniffer(ctx context.Context, cReader *cachedReader, metadataOnly bool, netw
case common.ErrNoClue: // No Clue: protocol not matches, and sniffer cannot determine whether there will be a match or not case common.ErrNoClue: // No Clue: protocol not matches, and sniffer cannot determine whether there will be a match or not
totalAttempt++ totalAttempt++
case protocol.ErrProtoNeedMoreData: // Protocol Need More Data: protocol matches, but need more data to complete sniffing case protocol.ErrProtoNeedMoreData: // Protocol Need More Data: protocol matches, but need more data to complete sniffing
if cacheErr != nil { // Cache error (e.g. timeout) counts for failed attempt // in this case, do not add totalAttempt(allow to read until timeout)
totalAttempt++
}
default: default:
return result, err return result, err
} }
} else {
totalAttempt++
} }
if totalAttempt >= 2 || cacheDeadline <= 0 { if totalAttempt >= 2 || cacheDeadline <= 0 {
return nil, errSniffingTimeout return nil, errSniffingTimeout