From 6bd3c7443445a6951a79e7534db357aac743e395 Mon Sep 17 00:00:00 2001
From: Dmitry Pankov <dmitry@enula.ru>
Date: Thu, 22 Aug 2024 00:56:46 +0300
Subject: [PATCH] Replace TCPAddrFromAddrPort with built-in one

---
 net.go     | 16 ----------------
 routine.go |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 net.go

diff --git a/net.go b/net.go
deleted file mode 100644
index 3c89f39..0000000
--- a/net.go
+++ /dev/null
@@ -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()),
-	}
-}
diff --git a/routine.go b/routine.go
index eba9fde..e9d448d 100644
--- a/routine.go
+++ b/routine.go
@@ -206,7 +206,7 @@ func tcpClientForward(vt *VirtualTun, raddr *addressPort, conn net.Conn) {
 		return
 	}
 
-	tcpAddr := TCPAddrFromAddrPort(*target)
+	tcpAddr := net.TCPAddrFromAddrPort(*target)
 
 	sconn, err := vt.Tnet.DialTCP(tcpAddr)
 	if err != nil {
@@ -245,7 +245,7 @@ func STDIOTcpForward(vt *VirtualTun, raddr *addressPort) {
 		return
 	}
 
-	tcpAddr := TCPAddrFromAddrPort(*target)
+	tcpAddr := net.TCPAddrFromAddrPort(*target)
 	sconn, err := vt.Tnet.DialTCP(tcpAddr)
 	if err != nil {
 		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
 	}
 
-	tcpAddr := TCPAddrFromAddrPort(*target)
+	tcpAddr := net.TCPAddrFromAddrPort(*target)
 
 	sconn, err := net.DialTCP("tcp", nil, tcpAddr)
 	if err != nil {