up

xjasonlyu · Aug 31, 2024 · 091038d · 091038d
1 parent 31cb082
commit 091038d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/tunnel/addr.go b/tunnel/addr.go
@@ -32,7 +32,8 @@ func parseAddrString(s string) (netip.Addr, uint16) {
 	return ap.Addr(), ap.Port()
 }
 
-func parseAddr(addr tcpip.Address) netip.Addr {
+// parseTCPIPAddress parses tcpip.Address to netip.Addr.
+func parseTCPIPAddress(addr tcpip.Address) netip.Addr {
 	ip, _ := netip.AddrFromSlice(addr.AsSlice())
 	return ip
 }
diff --git a/tunnel/tcp.go b/tunnel/tcp.go
@@ -20,9 +20,9 @@ func (t *Tunnel) handleTCPConn(originConn adapter.TCPConn) {
 	id := originConn.ID()
 	metadata := &M.Metadata{
 		Network: M.TCP,
-		SrcIP:   parseAddr(id.RemoteAddress),
+		SrcIP:   parseTCPIPAddress(id.RemoteAddress),
 		SrcPort: id.RemotePort,
-		DstIP:   parseAddr(id.LocalAddress),
+		DstIP:   parseTCPIPAddress(id.LocalAddress),
 		DstPort: id.LocalPort,
 	}
 

diff --git a/tunnel/udp.go b/tunnel/udp.go
@@ -20,9 +20,9 @@ func (t *Tunnel) handleUDPConn(uc adapter.UDPConn) {
 	id := uc.ID()
 	metadata := &M.Metadata{
 		Network: M.UDP,
-		SrcIP:   parseAddr(id.RemoteAddress),
+		SrcIP:   parseTCPIPAddress(id.RemoteAddress),
 		SrcPort: id.RemotePort,
-		DstIP:   parseAddr(id.LocalAddress),
+		DstIP:   parseTCPIPAddress(id.LocalAddress),
 		DstPort: id.LocalPort,
 	}