github/trojan-go
4
0
Fork 0
mirror of https://github.com/p4gefau1t/trojan-go.git synced 2024-04-21 12:21:34 +00:00
Code Issues Releases Wiki Activity

Refinement: minor fixes (#354)

Browse Source
This commit is contained in:
cty
2021-06-01 08:24:08 +08:00
committed by GitHub
parent 15817b5060
commit 7f8d638260
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tunnel/trojan/packet.go
+5 -7
View File
@@ -59,15 +59,13 @@ func (c *PacketConn) ReadWithMetadata(payload []byte) (int, *tunnel.Metadata, er
return 0, nil, common.NewError("failed to parse udp packet addr").Base(err)
}
lengthBuf := [2]byte{}
_, err := io.ReadFull(c.Conn, lengthBuf[:])
if err != nil {
if _, err := io.ReadFull(c.Conn, lengthBuf[:]); err != nil {
return 0, nil, common.NewError("failed to read length")
}
length := int(binary.BigEndian.Uint16(lengthBuf[:]))
crlf := [2]byte{}
io.ReadFull(c.Conn, crlf[:])
if err != nil {
if _, err := io.ReadFull(c.Conn, crlf[:]); err != nil {
return 0, nil, common.NewError("failed to read crlf")
}
@@ -75,13 +73,13 @@ func (c *PacketConn) ReadWithMetadata(payload []byte) (int, *tunnel.Metadata, er
io.CopyN(ioutil.Discard, c.Conn, int64(length)) // drain the rest of the packet
return 0, nil, common.NewError("incoming packet size is too large")
}
_, err = io.ReadFull(c.Conn, payload[:length])
if err != nil {
if _, err := io.ReadFull(c.Conn, payload[:length]); err != nil {
return 0, nil, common.NewError("failed to read payload")
}
log.Debug("udp packet from", c.RemoteAddr(), "metadata", addr.String(), "size", length)
return length, &tunnel.Metadata{
Address: addr,
}, err
}, nil
}