From b247919a03988d6db5e25dbd3c6d5c2412956352 Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Sun, 23 Oct 2022 16:19:57 -0700
Subject: [PATCH] chore: renames (HyTCPConn, HyUDPConn)

---
 pkg/core/client.go   | 37 +++++++++++++++++++------------------
 pkg/relay/udp.go     |  4 ++--
 pkg/socks5/server.go |  2 +-
 pkg/tun/udp.go       |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkg/core/client.go b/pkg/core/client.go
index 9d57c95..1419c4c 100644
--- a/pkg/core/client.go
+++ b/pkg/core/client.go
@@ -233,14 +233,14 @@ func (c *Client) DialTCP(addr string) (net.Conn, error) {
 		_ = stream.Close()
 		return nil, fmt.Errorf("connection rejected: %s", sr.Message)
 	}
-	return &quicConn{
+	return &hyTCPConn{
 		Orig:             stream,
 		PseudoLocalAddr:  session.LocalAddr(),
 		PseudoRemoteAddr: session.RemoteAddr(),
 	}, nil
 }
 
-func (c *Client) DialUDP() (UDPConn, error) {
+func (c *Client) DialUDP() (HyUDPConn, error) {
 	session, stream, err := c.openStreamWithReconnect()
 	if err != nil {
 		return nil, err
@@ -275,7 +275,7 @@ func (c *Client) DialUDP() (UDPConn, error) {
 	sessionMap[sr.UDPSessionID] = nCh
 	c.udpSessionMutex.Unlock()
 
-	pktConn := &quicPktConn{
+	pktConn := &hyUDPConn{
 		Session: session,
 		Stream:  stream,
 		CloseFunc: func() {
@@ -302,51 +302,52 @@ func (c *Client) Close() error {
 	return err
 }
 
-type quicConn struct {
+// hyTCPConn wraps a QUIC stream and implements net.Conn returned by Client.DialTCP
+type hyTCPConn struct {
 	Orig             quic.Stream
 	PseudoLocalAddr  net.Addr
 	PseudoRemoteAddr net.Addr
 }
 
-func (w *quicConn) Read(b []byte) (n int, err error) {
+func (w *hyTCPConn) Read(b []byte) (n int, err error) {
 	return w.Orig.Read(b)
 }
 
-func (w *quicConn) Write(b []byte) (n int, err error) {
+func (w *hyTCPConn) Write(b []byte) (n int, err error) {
 	return w.Orig.Write(b)
 }
 
-func (w *quicConn) Close() error {
+func (w *hyTCPConn) Close() error {
 	return w.Orig.Close()
 }
 
-func (w *quicConn) LocalAddr() net.Addr {
+func (w *hyTCPConn) LocalAddr() net.Addr {
 	return w.PseudoLocalAddr
 }
 
-func (w *quicConn) RemoteAddr() net.Addr {
+func (w *hyTCPConn) RemoteAddr() net.Addr {
 	return w.PseudoRemoteAddr
 }
 
-func (w *quicConn) SetDeadline(t time.Time) error {
+func (w *hyTCPConn) SetDeadline(t time.Time) error {
 	return w.Orig.SetDeadline(t)
 }
 
-func (w *quicConn) SetReadDeadline(t time.Time) error {
+func (w *hyTCPConn) SetReadDeadline(t time.Time) error {
 	return w.Orig.SetReadDeadline(t)
 }
 
-func (w *quicConn) SetWriteDeadline(t time.Time) error {
+func (w *hyTCPConn) SetWriteDeadline(t time.Time) error {
 	return w.Orig.SetWriteDeadline(t)
 }
 
-type UDPConn interface {
+type HyUDPConn interface {
 	ReadFrom() ([]byte, string, error)
 	WriteTo([]byte, string) error
 	Close() error
 }
 
-type quicPktConn struct {
+type hyUDPConn struct {
 	Session      quic.Connection
 	Stream       quic.Stream
 	CloseFunc    func()
@@ -354,7 +355,7 @@ type quicPktConn struct {
 	MsgCh        <-chan *udpMessage
 }
 
-func (c *quicPktConn) Hold() {
+func (c *hyUDPConn) Hold() {
 	// Hold the stream until it's closed
 	buf := make([]byte, 1024)
 	for {
@@ -366,7 +367,7 @@ func (c *quicPktConn) Hold() {
 	_ = c.Close()
 }
 
-func (c *quicPktConn) ReadFrom() ([]byte, string, error) {
+func (c *hyUDPConn) ReadFrom() ([]byte, string, error) {
 	msg := <-c.MsgCh
 	if msg == nil {
 		// Closed
@@ -375,7 +376,7 @@ func (c *quicPktConn) ReadFrom() ([]byte, string, error) {
 	return msg.Data, net.JoinHostPort(msg.Host, strconv.Itoa(int(msg.Port))), nil
 }
 
-func (c *quicPktConn) WriteTo(p []byte, addr string) error {
+func (c *hyUDPConn) WriteTo(p []byte, addr string) error {
 	host, port, err := utils.SplitHostPort(addr)
 	if err != nil {
 		return err
@@ -414,7 +415,7 @@ func (c *quicPktConn) WriteTo(p []byte, addr string) error {
 	}
 }
 
-func (c *quicPktConn) Close() error {
+func (c *hyUDPConn) Close() error {
 	c.CloseFunc()
 	return c.Stream.Close()
 }
diff --git a/pkg/relay/udp.go b/pkg/relay/udp.go
index bd2bc2e..c6b34ce 100644
--- a/pkg/relay/udp.go
+++ b/pkg/relay/udp.go
@@ -46,7 +46,7 @@ func NewUDPRelay(hyClient *core.Client, listen, remote string, timeout time.Dura
 }
 
 type connEntry struct {
-	HyConn   core.UDPConn
+	HyConn   core.HyUDPConn
 	Deadline atomic.Value
 }
 
@@ -56,7 +56,7 @@ func (r *UDPRelay) ListenAndServe() error {
 		return err
 	}
 	defer conn.Close()
-	// src <-> HyClient UDPConn
+	// src <-> HyClient HyUDPConn
 	connMap := make(map[string]*connEntry)
 	var connMapMutex sync.RWMutex
 	// Read loop
diff --git a/pkg/socks5/server.go b/pkg/socks5/server.go
index f9153bf..4cbd4dd 100644
--- a/pkg/socks5/server.go
+++ b/pkg/socks5/server.go
@@ -320,7 +320,7 @@ func (s *Server) handleUDP(c *net.TCPConn, r *socks5.Request) error {
 	return nil
 }
 
-func (s *Server) udpServer(clientConn *net.UDPConn, localRelayConn *net.UDPConn, hyUDP core.UDPConn) {
+func (s *Server) udpServer(clientConn *net.UDPConn, localRelayConn *net.UDPConn, hyUDP core.HyUDPConn) {
 	var clientAddr *net.UDPAddr
 	buf := make([]byte, udpBufferSize)
 	// Local to remote
diff --git a/pkg/tun/udp.go b/pkg/tun/udp.go
index 3c1af16..8bfb030 100644
--- a/pkg/tun/udp.go
+++ b/pkg/tun/udp.go
@@ -52,7 +52,7 @@ func (s *Server) handleUDPConn(conn adapter.UDPConn) {
 	err = s.relayUDP(conn, rc, &remoteAddr, s.Timeout)
 }
 
-func (s *Server) relayUDP(lc adapter.UDPConn, rc core.UDPConn, to *net.UDPAddr, timeout time.Duration) (err error) {
+func (s *Server) relayUDP(lc adapter.UDPConn, rc core.HyUDPConn, to *net.UDPAddr, timeout time.Duration) (err error) {
 	errChan := make(chan error, 2)
 	// local => remote
 	go func() {