fix udp payload reading

p4gefau1t · May 28, 2020 · 901ed91 · 901ed91
1 parent c1fbc67
commit 901ed91
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/protocol/trojan/packet.go b/protocol/trojan/packet.go
@@ -26,12 +26,15 @@ func (i *TrojanPacketSession) ReadPacket() (*protocol.Request, []byte, error) {
 	lengthBuf := [2]byte{}
 	_, err := io.ReadFull(i.conn, lengthBuf[:])
 	if err != nil {
-		return req, nil, common.NewError("failed to read length")
+		return req, nil, common.NewError("Failed to read length")
 	}
 	length := binary.BigEndian.Uint16(lengthBuf[:])
 	packet := make([]byte, length)
-	n, err := i.conn.Read(packet)
-	return req, packet[:n], err
+	_, err = io.ReadFull(i.conn, packet)
+	if err != nil {
+		return req, nil, common.NewError("Failed to read payload")
+	}
+	return req, packet[:], err
 }
 
 func (i *TrojanPacketSession) WritePacket(req *protocol.Request, packet []byte) (int, error) {