From 2bf585afed0f398c55ebb7af90b2210765fe603d Mon Sep 17 00:00:00 2001
From: Jason <xjasonlyu@gmail.com>
Date: Wed, 7 Aug 2019 17:05:56 +0800
Subject: [PATCH] rename variables

---
 proxy/socks/tcp.go |  8 ++++----
 proxy/socks/udp.go | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/proxy/socks/tcp.go b/proxy/socks/tcp.go
index 79188e5..5256c98 100644
--- a/proxy/socks/tcp.go
+++ b/proxy/socks/tcp.go
@@ -127,8 +127,8 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
 		}
 	}
 
-	dest := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
-	remoteConn, err := dialer.Dial(target.Network(), dest)
+	targetAddr := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
+	remoteConn, err := dialer.Dial(target.Network(), targetAddr)
 	if err != nil {
 		return err
 	}
@@ -148,7 +148,7 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
 			ProcessName:   process,
 			Network:       target.Network(),
 			LocalAddr:     localConn.LocalAddr().String(),
-			RemoteAddr:    dest,
+			RemoteAddr:    targetAddr,
 			UploadBytes:   0,
 			DownloadBytes: 0,
 			SessionStart:  time.Now(),
@@ -163,7 +163,7 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
 	// relay connections
 	go h.relay(localConn, remoteConn, sess)
 
-	log.Access(process, "proxy", target.Network(), localConn.LocalAddr().String(), dest)
+	log.Access(process, "proxy", target.Network(), localConn.LocalAddr().String(), targetAddr)
 
 	return nil
 }
diff --git a/proxy/socks/udp.go b/proxy/socks/udp.go
index 9414fb2..f454f71 100644
--- a/proxy/socks/udp.go
+++ b/proxy/socks/udp.go
@@ -112,12 +112,12 @@ func (h *udpHandler) Connect(conn core.UDPConn, target *net.UDPAddr) error {
 			targetHost = host
 		}
 	}
-	dest := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
+	targetAddr := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
 
-	return h.connectInternal(conn, dest)
+	return h.connectInternal(conn, targetAddr)
 }
 
-func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
+func (h *udpHandler) connectInternal(conn core.UDPConn, targetAddr string) error {
 	c, err := net.DialTimeout("tcp", core.ParseTCPAddr(h.proxyHost, h.proxyPort).String(), 4*time.Second)
 	if err != nil {
 		return err
@@ -133,8 +133,8 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
 		return err
 	}
 
-	if len(dest) != 0 {
-		targetAddr := ParseAddr(dest)
+	if len(targetAddr) != 0 {
+		targetAddr := ParseAddr(targetAddr)
 		// write VER CMD RSV ATYP DST.ADDR DST.PORT
 		_, _ = c.Write(append([]byte{5, socks5UDPAssociate, 0}, targetAddr...))
 	} else {
@@ -176,7 +176,7 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
 
 	go h.fetchUDPInput(conn, pc)
 
-	if len(dest) != 0 {
+	if len(targetAddr) != 0 {
 		var process string
 		if h.sessionStater != nil {
 			// Get name of the process.
@@ -191,14 +191,14 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
 				ProcessName:   process,
 				Network:       conn.LocalAddr().Network(),
 				LocalAddr:     conn.LocalAddr().String(),
-				RemoteAddr:    dest,
+				RemoteAddr:    targetAddr,
 				UploadBytes:   0,
 				DownloadBytes: 0,
 				SessionStart:  time.Now(),
 			}
 			h.sessionStater.AddSession(conn, sess)
 		}
-		log.Access(process, "proxy", "udp", conn.LocalAddr().String(), dest)
+		log.Access(process, "proxy", "udp", conn.LocalAddr().String(), targetAddr)
 	}
 	return nil
 }
@@ -218,8 +218,8 @@ func (h *udpHandler) ReceiveTo(conn core.UDPConn, data []byte, addr *net.UDPAddr
 			}
 		}
 
-		dest := net.JoinHostPort(targetHost, strconv.Itoa(addr.Port))
-		buf := append([]byte{0, 0, 0}, ParseAddr(dest)...)
+		targetAddr := net.JoinHostPort(targetHost, strconv.Itoa(addr.Port))
+		buf := append([]byte{0, 0, 0}, ParseAddr(targetAddr)...)
 		buf = append(buf, data[:]...)
 		n, err := pc.WriteTo(buf, remoteAddr)
 		if n > 0 && h.sessionStater != nil {