Fix IP parsing bug

Iam54r1n4 · Nov 29, 2024 · c280b4c · c280b4c
1 parent a5067dd
commit c280b4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -181,7 +181,7 @@ func (s *Server) handleConnection(gc *gordafarid.Conn) {
 	}
 
 	// Extract target server information from the handshake result
-	dstAddr := string(handshakeResult.DstAddr)
+	dstAddr := utils.IPBytesToString(handshakeResult.Atyp, handshakeResult.DstAddr)
 	dstPort := binary.BigEndian.Uint16(handshakeResult.DstPort[:])
 	targetAddr := net.JoinHostPort(dstAddr, fmt.Sprint(dstPort))
 

diff --git a/pkg/net/utils/helper.go b/pkg/net/utils/helper.go
@@ -123,3 +123,15 @@ func ReadPort(ctx context.Context, conn net.Conn) ([2]byte, error) {
 	}
 	return port, nil
 }
+
+// IPBytesToString converts IP bytes to a string based on the address type
+func IPBytesToString(atyp byte, ip []byte) string {
+	switch atyp {
+	case protocol.AtypIPv4, protocol.AtypIPv6:
+		return net.IP(ip).String()
+	case protocol.AtypDomain:
+		return string(ip)
+	default:
+		return ""
+	}
+}