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

Fix sniffer

Browse Source
This commit is contained in:
世界 2023-08-24 11:07:22 +08:00
parent 9be5cd99c1
commit de38a8e881
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/sniff/sniff.go
View File

@ -22,19 +22,24 @@ func PeekStream(ctx context.Context, conn net.Conn, buffer *buf.Buffer, timeout
if timeout == 0 { if timeout == 0 {
timeout = C.ReadPayloadTimeout timeout = C.ReadPayloadTimeout
} }
err := conn.SetReadDeadline(time.Now().Add(timeout)) deadline := time.Now().Add(timeout)
for i := 0; ; i++ {
err := conn.SetReadDeadline(deadline)
if err != nil { if err != nil {
return nil, E.Cause(err, "set read deadline") return nil, E.Cause(err, "set read deadline")
} }
_, err = buffer.ReadOnceFrom(conn) _, err = buffer.ReadOnceFrom(conn)
err = E.Errors(err, conn.SetReadDeadline(time.Time{})) err = E.Errors(err, conn.SetReadDeadline(time.Time{}))
if i > 0 {
break
}
if err != nil { if err != nil {
return nil, E.Cause(err, "read payload") return nil, E.Cause(err, "read payload")
} }
var metadata *adapter.InboundContext }
var errors []error var errors []error
for _, sniffer := range sniffers { for _, sniffer := range sniffers {
metadata, err = sniffer(ctx, bytes.NewReader(buffer.Bytes())) metadata, err := sniffer(ctx, bytes.NewReader(buffer.Bytes()))
if metadata != nil { if metadata != nil {
return metadata, nil return metadata, nil
} }