Don't connect if DERP is empty

kylecarbs · kylecarbs · commit 961540291ae4 · 2022-10-17T00:53:30.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -344,9 +344,14 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 			// reason. TODO: @kylecarbs debug this!
 			KeepAlive: ok && peerStatus.Active,
 		}
+		// If no preferred DERP is provided, don't set an IP!
+		if node.PreferredDERP == 0 {
+			peerNode.DERP = ""
+		}
 		if c.blockEndpoints {
 			peerNode.Endpoints = nil
 		}
+		c.logger.Debug(context.Background(), "adding node", slog.F("node", peerNode))
 		c.peerMap[node.ID] = peerNode
 	}
 	c.netMap.Peers = make([]*tailcfg.Node, 0, len(c.peerMap))

Original file line number	Diff line number	Diff line change
`@@ -344,9 +344,14 @@ func (c Conn) UpdateNodes(nodes []Node) error {`
`344`	`344`	`// reason. TODO: @kylecarbs debug this!`
`345`	`345`	`KeepAlive: ok && peerStatus.Active,`
`346`	`346`	`}`
	`347`	`+ // If no preferred DERP is provided, don't set an IP!`
	`348`	`+ if node.PreferredDERP == 0 {`
	`349`	`+ peerNode.DERP = ""`
	`350`	`+ }`
`347`	`351`	`if c.blockEndpoints {`
`348`	`352`	`peerNode.Endpoints = nil`
`349`	`353`	`}`
	`354`	`+ c.logger.Debug(context.Background(), "adding node", slog.F("node", peerNode))`
`350`	`355`	`c.peerMap[node.ID] = peerNode`
`351`	`356`	`}`
`352`	`357`	`c.netMap.Peers = make([]*tailcfg.Node, 0, len(c.peerMap))`