mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-04 14:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise the Code per XTLS#1515 (#1536)

Browse Source 
* Use buf.FromBytes(make([]byte, 0, buf.Size)) to create `first`

Fixes https://github.com/XTLS/Xray-core/issues/1515

* Update server.go

* Update inbound.go

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
MP 2023-01-17 11:18:58 +08:00 committed by GitHub
parent 7added2693
commit 77d2f9edd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/trojan/server.go
View File

@ -155,9 +155,8 @@ func (s *Server) Process(ctx context.Context, network net.Network, conn stat.Con
return newError("unable to set read deadline").Base(err).AtWarning() return newError("unable to set read deadline").Base(err).AtWarning()
} }
first := buf.New() first := buf.FromBytes(make([]byte, buf.Size))
defer first.Release() first.Clear()
firstLen, err := first.ReadFrom(conn) firstLen, err := first.ReadFrom(conn)
if err != nil { if err != nil {
return newError("failed to read first request").Base(err) return newError("failed to read first request").Base(err)

5
proxy/vless/inbound/inbound.go
View File

@ -188,9 +188,8 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
return newError("unable to set read deadline").Base(err).AtWarning() return newError("unable to set read deadline").Base(err).AtWarning()
} }
first := buf.New() first := buf.FromBytes(make([]byte, buf.Size))
defer first.Release() first.Clear()
firstLen, _ := first.ReadFrom(connection) firstLen, _ := first.ReadFrom(connection)
newError("firstLen = ", firstLen).AtInfo().WriteToLog(sid) newError("firstLen = ", firstLen).AtInfo().WriteToLog(sid)