set read deadline for inbound packets

slp/client.go

@@ -197,7 +197,7 @@ func (c *Client) recvResponse() (string, error) {
 	//
 	// https://wiki.vg/Server_List_Ping#Status_Response
 
-	res, err := packet.NewInboundPacket(c.conn)
+	res, err := packet.NewInboundPacket(c.conn, c.timeout)
 	if err != nil {
 		return "", fmt.Errorf("failed to read status response: %w", err)
 	}
@@ -250,7 +250,7 @@ func (c *Client) recvPong() (int64, error) {
 	//
 	// https://wiki.vg/Server_List_Ping#Pong_Response
 
-	pong, err := packet.NewInboundPacket(c.conn)
+	pong, err := packet.NewInboundPacket(c.conn, c.timeout)
 	if err != nil {
 		return 0, fmt.Errorf("failed to read pong: %w", err)
 	}
@@ -280,6 +280,7 @@ func (c *Client) connectAndHandshake() error {
 			return err
 		}
 	}
+
 	return nil
 }
 

slp/packet/inbound.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"time"
 )
 
 // InboundPacket represents a packet received from a connection.
@@ -18,7 +19,11 @@ type InboundPacket struct {
 }
 
 // NewInboundPacket creates a new InboundPacket from a network connection.
-func NewInboundPacket(conn net.Conn) (*InboundPacket, error) {
+func NewInboundPacket(conn net.Conn, timeout time.Duration) (*InboundPacket, error) {
+	if err := conn.SetReadDeadline(time.Now().Add(timeout)); err != nil {
+		return nil, fmt.Errorf("failed to set read deadline: %w", err)
+	}
+
 	p := &InboundPacket{}
 	connReader := bufio.NewReader(conn)
 
@@ -48,6 +53,11 @@ func NewInboundPacket(conn net.Conn) (*InboundPacket, error) {
 	return p, nil
 }
 
+// ID returns the id of the packet.
+func (p *InboundPacket) ID() int32 {
+	return p.id
+}
+
 // ReadInt reads a 32-bit integer from the packet.
 func (p *InboundPacket) ReadInt() (int32, error) {
 	buf := make([]byte, 4)
@@ -157,13 +167,12 @@ func (p *InboundPacket) ReadBytes(length int) ([]byte, error) {
 	return b, nil
 }
 
-// ID returns the id of the packet.
-func (p *InboundPacket) ID() int32 {
-	return p.id
-}
-
 // readBytes reads a specified number of bytes from a buffered reader.
 func readBytes(reader *bufio.Reader, length int) ([]byte, error) {
+	if length < 0 {
+		return nil, fmt.Errorf("read length cannot be negative: %d", length)
+	}
+
 	data := make([]byte, length)
 	var received int
 	for received < length {