TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 23:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/derper: dial VPC address with right context

Browse Source 
Fix bug from just-submitted e422e9f4c949.

Updates #2414

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-07-29 14:29:05 -07:00
parent e422e9f4c9
commit d37451bac6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/derper/mesh.go
View File

@ -58,7 +58,7 @@ func startMeshWithHost(s *derp.Server, host string) error {
ips, _ := r.LookupIP(subCtx, "ip", vpcHost) ips, _ := r.LookupIP(subCtx, "ip", vpcHost)
if len(ips) > 0 { if len(ips) > 0 {
vpcAddr := net.JoinHostPort(ips[0].String(), port) vpcAddr := net.JoinHostPort(ips[0].String(), port)
c, err := d.DialContext(ctx, network, vpcAddr) c, err := d.DialContext(subCtx, network, vpcAddr)
if err == nil { if err == nil {
log.Printf("connected to %v (%v) instead of %v", vpcHost, ips[0], base) log.Printf("connected to %v (%v) instead of %v", vpcHost, ips[0], base)
return c, nil return c, nil