summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNaman Sood <mail@nsood.in>2021-04-21 14:44:07 -0400
committerNaman Sood <mail@nsood.in>2021-04-21 14:44:07 -0400
commitcd4e7e51a7ad062e67223d9bcf108b039f915f6a (patch)
treec6f8aa0ec6c7c244599f6d62b6ad5c4be628a975
parent6bb159d5fa9953bd752c1217ab4dd625c8f60281 (diff)
downloadtailscale-naman/netstack-request-logging.tar.xz
tailscale-naman/netstack-request-logging.zip
use net.JoinHostPortnaman/netstack-request-logging
Signed-off-by: Naman Sood <mail@nsood.in>
-rw-r--r--wgengine/netstack/netstack.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/wgengine/netstack/netstack.go b/wgengine/netstack/netstack.go
index 1fe70134b..47c934b38 100644
--- a/wgengine/netstack/netstack.go
+++ b/wgengine/netstack/netstack.go
@@ -566,5 +566,7 @@ func startPacketCopy(ctx context.Context, cancel context.CancelFunc, dst net.Pac
}
func stringifyTEI(tei stack.TransportEndpointID) string {
- return fmt.Sprintf("%s:%v -> %s:%v", tei.LocalAddress, tei.LocalPort, tei.RemoteAddress, tei.RemotePort)
+ localHostPort := net.JoinHostPort(tei.LocalAddress.String(), strconv.Itoa(int(tei.LocalPort)))
+ remoteHostPort := net.JoinHostPort(tei.RemoteAddress.String(), strconv.Itoa(int(tei.RemotePort)))
+ return fmt.Sprintf("%s -> %s", remoteHostPort, localHostPort)
}