package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-08 02:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename variables

Browse Source
This commit is contained in:
Jason
2019-08-07 17:05:56 +08:00
parent 64c8c45514
commit 2bf585afed
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/socks/tcp.go
View File

@@ -127,8 +127,8 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
} }
} }
dest := net.JoinHostPort(targetHost, strconv.Itoa(target.Port)) targetAddr := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
remoteConn, err := dialer.Dial(target.Network(), dest) remoteConn, err := dialer.Dial(target.Network(), targetAddr)
if err != nil { if err != nil {
return err return err
} }
@@ -148,7 +148,7 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
ProcessName: process, ProcessName: process,
Network: target.Network(), Network: target.Network(),
LocalAddr: localConn.LocalAddr().String(), LocalAddr: localConn.LocalAddr().String(),
RemoteAddr: dest, RemoteAddr: targetAddr,
UploadBytes: 0, UploadBytes: 0,
DownloadBytes: 0, DownloadBytes: 0,
SessionStart: time.Now(), SessionStart: time.Now(),
@@ -163,7 +163,7 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
// relay connections // relay connections
go h.relay(localConn, remoteConn, sess) 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 return nil
} }

20
proxy/socks/udp.go
View File

@@ -112,12 +112,12 @@ func (h *udpHandler) Connect(conn core.UDPConn, target *net.UDPAddr) error {
targetHost = host 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) c, err := net.DialTimeout("tcp", core.ParseTCPAddr(h.proxyHost, h.proxyPort).String(), 4*time.Second)
if err != nil { if err != nil {
return err return err
@@ -133,8 +133,8 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
return err return err
} }
if len(dest) != 0 { if len(targetAddr) != 0 {
targetAddr := ParseAddr(dest) targetAddr := ParseAddr(targetAddr)
// write VER CMD RSV ATYP DST.ADDR DST.PORT // write VER CMD RSV ATYP DST.ADDR DST.PORT
_, _ = c.Write(append([]byte{5, socks5UDPAssociate, 0}, targetAddr...)) _, _ = c.Write(append([]byte{5, socks5UDPAssociate, 0}, targetAddr...))
} else { } else {
@@ -176,7 +176,7 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
go h.fetchUDPInput(conn, pc) go h.fetchUDPInput(conn, pc)
if len(dest) != 0 { if len(targetAddr) != 0 {
var process string var process string
if h.sessionStater != nil { if h.sessionStater != nil {
// Get name of the process. // Get name of the process.
@@ -191,14 +191,14 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
ProcessName: process, ProcessName: process,
Network: conn.LocalAddr().Network(), Network: conn.LocalAddr().Network(),
LocalAddr: conn.LocalAddr().String(), LocalAddr: conn.LocalAddr().String(),
RemoteAddr: dest, RemoteAddr: targetAddr,
UploadBytes: 0, UploadBytes: 0,
DownloadBytes: 0, DownloadBytes: 0,
SessionStart: time.Now(), SessionStart: time.Now(),
} }
h.sessionStater.AddSession(conn, sess) 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 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)) targetAddr := net.JoinHostPort(targetHost, strconv.Itoa(addr.Port))
buf := append([]byte{0, 0, 0}, ParseAddr(dest)...) buf := append([]byte{0, 0, 0}, ParseAddr(targetAddr)...)
buf = append(buf, data[:]...) buf = append(buf, data[:]...)
n, err := pc.WriteTo(buf, remoteAddr) n, err := pc.WriteTo(buf, remoteAddr)
if n > 0 && h.sessionStater != nil { if n > 0 && h.sessionStater != nil {