mirrors/wireproxy
1
0
Fork 0
mirror of https://github.com/whyvl/wireproxy.git synced 2025-04-29 19:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace TCPAddrFromAddrPort with built-in one

Browse source
This commit is contained in:
Dmitry Pankov 2024-08-22 00:56:46 +03:00
parent a21bd62350
commit 6bd3c74434
No known key found for this signature in database
GPG key ID: D958C2967535BA49
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
net.go
View file

@ -1,16 +0,0 @@
// will delete when upgrading to go 1.18
package wireproxy
import (
"net"
"net/netip"
)
func TCPAddrFromAddrPort(addr netip.AddrPort) *net.TCPAddr {
return &net.TCPAddr{
IP: addr.Addr().AsSlice(),
Zone: addr.Addr().Zone(),
Port: int(addr.Port()),
}
}

6
routine.go
View file

@ -206,7 +206,7 @@ func tcpClientForward(vt *VirtualTun, raddr *addressPort, conn net.Conn) {
return return
} }
tcpAddr := TCPAddrFromAddrPort(*target) tcpAddr := net.TCPAddrFromAddrPort(*target)
sconn, err := vt.Tnet.DialTCP(tcpAddr) sconn, err := vt.Tnet.DialTCP(tcpAddr)
if err != nil { if err != nil {
@ -245,7 +245,7 @@ func STDIOTcpForward(vt *VirtualTun, raddr *addressPort) {
return return
} }
tcpAddr := TCPAddrFromAddrPort(*target) tcpAddr := net.TCPAddrFromAddrPort(*target)
sconn, err := vt.Tnet.DialTCP(tcpAddr) sconn, err := vt.Tnet.DialTCP(tcpAddr)
if err != nil { if err != nil {
errorLogger.Printf("TCP Client Tunnel to %s (%s): %s\n", target, tcpAddr, err.Error()) errorLogger.Printf("TCP Client Tunnel to %s (%s): %s\n", target, tcpAddr, err.Error())
@ -305,7 +305,7 @@ func tcpServerForward(vt *VirtualTun, raddr *addressPort, conn net.Conn) {
return return
} }
tcpAddr := TCPAddrFromAddrPort(*target) tcpAddr := net.TCPAddrFromAddrPort(*target)
sconn, err := net.DialTCP("tcp", nil, tcpAddr) sconn, err := net.DialTCP("tcp", nil, tcpAddr)
if err != nil { if err != nil {