diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2021-07-29 14:29:05 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@tailscale.com> | 2021-07-29 14:29:31 -0700 |
| commit | d37451bac6f38cc09b853b08b1dc8359ba767fa1 (patch) | |
| tree | 81ec1c6b23264771a39cfe4cc3db35605fe780f3 | |
| parent | e422e9f4c94910cef7b0a0002e450082927a4320 (diff) | |
| download | tailscale-d37451bac6f38cc09b853b08b1dc8359ba767fa1.tar.xz tailscale-d37451bac6f38cc09b853b08b1dc8359ba767fa1.zip | |
cmd/derper: dial VPC address with right context
Fix bug from just-submitted e422e9f4c949.
Updates #2414
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
| -rw-r--r-- | cmd/derper/mesh.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/derper/mesh.go b/cmd/derper/mesh.go index aadde1263..9c9a936f5 100644 --- a/cmd/derper/mesh.go +++ b/cmd/derper/mesh.go @@ -58,7 +58,7 @@ func startMeshWithHost(s *derp.Server, host string) error { ips, _ := r.LookupIP(subCtx, "ip", vpcHost) if len(ips) > 0 { vpcAddr := net.JoinHostPort(ips[0].String(), port) - c, err := d.DialContext(ctx, network, vpcAddr) + c, err := d.DialContext(subCtx, network, vpcAddr) if err == nil { log.Printf("connected to %v (%v) instead of %v", vpcHost, ips[0], base) return c, nil |