ipn/wg: m logs for addr type conv

Author: ignoramous

intra/ipn/wgnet.go

@@ -180,7 +180,7 @@ func (tnet *wgtun) dial(network, local, remote string) (net.Conn, error) {
 // tcp and udp dialers
 // --------------------------------------------------------------------
 
-func fullAddrFrom(ipp netip.AddrPort) (tcpip.FullAddress, tcpip.NetworkProtocolNumber, bool) {
+func fullAddrFrom(by string, ipp netip.AddrPort) (tcpip.FullAddress, tcpip.NetworkProtocolNumber, bool) {
 	var protoNumber tcpip.NetworkProtocolNumber
 	var nsdaddr tcpip.Address
 	if !ipp.IsValid() {
@@ -194,7 +194,7 @@ func fullAddrFrom(ipp netip.AddrPort) (tcpip.FullAddress, tcpip.NetworkProtocolN
 		protoNumber = ipv6.ProtocolNumber
 		nsdaddr = tcpip.AddrFrom16(ipp.Addr().As16())
 	}
-	log.V("wg: dial: translate ipp: %v -> %v", ipp, nsdaddr)
+	log.VV("wg: dial: %s translate ipp: %v => %v", by, ipp, nsdaddr)
 	return tcpip.FullAddress{
 		NIC:  wgnic,
 		Addr: nsdaddr,
@@ -203,16 +203,16 @@ func fullAddrFrom(ipp netip.AddrPort) (tcpip.FullAddress, tcpip.NetworkProtocolN
 }
 
 func (tnet *wgtun) DialContextTCPAddrPort(ctx context.Context, addr netip.AddrPort) (*gonet.TCPConn, error) {
-	if faddr, protocol, ok := fullAddrFrom(addr); ok {
+	if faddr, protocol, ok := fullAddrFrom("tcp", addr); ok {
 		return gonet.DialContextTCP(ctx, tnet.stack, faddr, protocol)
 	}
 	log.W("wg: %s: tcp: dial: invalid addr %s", tnet.id, addr)
 	return nil, errInvalidAddr
 }
 
 func (tnet *wgtun) DialTCPAddrPort(laddr, raddr netip.AddrPort) (*gonet.TCPConn, error) {
-	remote, protocol, _ := fullAddrFrom(raddr) // prefer "proto" from remote
-	local, _, _ := fullAddrFrom(laddr)
+	remote, protocol, _ := fullAddrFrom("tcp:remote", raddr) // prefer "proto" from remote
+	local, _, _ := fullAddrFrom("tcp:local", laddr)
 	ctx := context.Background()
 	// return gonet.DialTCP(tnet.stack, remote, protocol)
 	return gonet.DialTCPWithBind(
@@ -225,7 +225,7 @@ func (tnet *wgtun) DialTCPAddrPort(laddr, raddr netip.AddrPort) (*gonet.TCPConn,
 }
 
 func (tnet *wgtun) ListenTCPAddrPort(addr netip.AddrPort) (*gonet.TCPListener, error) {
-	if fa, pn, ok := fullAddrFrom(addr); ok {
+	if fa, pn, ok := fullAddrFrom("tcp:listen", addr); ok {
 		return gonet.ListenTCP(tnet.stack, fa, pn)
 	}
 	log.W("wg: %s: tcp: listen: invalid addr %s", tnet.id, addr)
@@ -236,13 +236,13 @@ func (tnet *wgtun) DialUDPAddrPort(laddr, raddr netip.AddrPort) (*gonet.UDPConn,
 	var src, dst *tcpip.FullAddress
 	var protocol tcpip.NetworkProtocolNumber
 
-	if srcaddr, srcprotocol, ok := fullAddrFrom(laddr); ok {
+	if srcaddr, srcprotocol, ok := fullAddrFrom("udp:local", laddr); ok {
 		protocol = srcprotocol
 		if !srcaddr.Addr.Unspecified() {
 			src = &srcaddr
 		} // else: unbound; src must be left nil
 	} // else: laddr not valid
-	if dstaddr, dstprotocol, ok := fullAddrFrom(raddr); ok {
+	if dstaddr, dstprotocol, ok := fullAddrFrom("udp:remote", raddr); ok {
 		protocol = dstprotocol
 		if !dstaddr.Addr.Unspecified() {
 			dst = &dstaddr
@@ -256,7 +256,7 @@ func (tnet *wgtun) DialUDPAddrPort(laddr, raddr netip.AddrPort) (*gonet.UDPConn,
 	}
 
 	// if src is non-nil, addrs are acquired on wgnic;
-	// ep.Bind -> ep.BindAndThen -> ep.net.BindAndThen -> ep.checkV4Mapped
+	// ep.Bind => ep.BindAndThen => ep.net.BindAndThen => ep.checkV4Mapped
 	// github.com/google/gvisor/blob/932d9dc6/pkg/tcpip/stack/addressable_endpoint_state.go#L644
 	return gonet.DialUDP(tnet.stack, src, dst, protocol)
 }