From 61c62f48d9b129ae8cb3a2bd751a5d7bf50248e5 Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@tailscale.com>
Date: Wed, 25 Aug 2021 19:07:49 -0700
Subject: [PATCH] wgengine/bench: disable unused benchmark that relies on
 legacy magicsock.

Signed-off-by: David Anderson <danderson@tailscale.com>
---
 wgengine/bench/bench_test.go | 1 +
 wgengine/bench/wg.go         | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wgengine/bench/bench_test.go b/wgengine/bench/bench_test.go
index 739b3d418..a34b2dcbe 100644
--- a/wgengine/bench/bench_test.go
+++ b/wgengine/bench/bench_test.go
@@ -42,6 +42,7 @@ func BenchmarkBatchTCP(b *testing.B) {
 }
 
 func BenchmarkWireGuardTest(b *testing.B) {
+	b.Skip("setup code doesn't support disco yet")
 	run(b, func(logf logger.Logf, traf *TrafficGen) {
 		setupWGTest(b, logf, traf, Addr1, Addr2)
 	})
diff --git a/wgengine/bench/wg.go b/wgengine/bench/wg.go
index c23ccc4dd..84332c97f 100644
--- a/wgengine/bench/wg.go
+++ b/wgengine/bench/wg.go
@@ -32,6 +32,7 @@ func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netadd
 	if err != nil {
 		log.Fatalf("e1 NewPrivateKey: %v", err)
 	}
+
 	c1 := wgcfg.Config{
 		Name:       "e1",
 		PrivateKey: k1,
@@ -105,7 +106,6 @@ func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netadd
 		}
 		endpoint := wgcfg.Endpoints{
 			PublicKey: c1.PrivateKey.Public(),
-			IPPorts:   wgcfg.NewIPPortSet(ipps...),
 		}
 
 		n := tailcfg.Node{
@@ -149,7 +149,6 @@ func setupWGTest(b *testing.B, logf logger.Logf, traf *TrafficGen, a1, a2 netadd
 		}
 		endpoint := wgcfg.Endpoints{
 			PublicKey: c2.PrivateKey.Public(),
-			IPPorts:   wgcfg.NewIPPortSet(ipps...),
 		}
 
 		n := tailcfg.Node{