lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine: adapt to removal of wgcfg.Key in wireguard-go

pull/1119/head
Josh Bleecher Snyder 2021-01-13 14:39:34 -08:00
parent 2bf49ddf90
commit 020084e84d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wgengine/userspace.go
View File

@ -295,7 +295,7 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
opts := &device.DeviceOptions{ opts := &device.DeviceOptions{
Logger: &logger, Logger: &logger,
HandshakeDone: func(peerKey wgcfg.Key, peer *device.Peer, deviceAllowedIPs *device.AllowedIPs) { HandshakeDone: func(peerKey device.NoisePublicKey, peer *device.Peer, deviceAllowedIPs *device.AllowedIPs) {
// Send an unsolicited status event every time a // Send an unsolicited status event every time a
// handshake completes. This makes sure our UI can // handshake completes. This makes sure our UI can
// update quickly as soon as it connects to a peer. // update quickly as soon as it connects to a peer.
@ -306,13 +306,14 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
// here. // here.
go e.RequestStatus() go e.RequestStatus()
peerWGKey := wgkey.Key(peerKey)
if e.magicConn.PeerHasDiscoKey(tailcfg.NodeKey(peerKey)) { if e.magicConn.PeerHasDiscoKey(tailcfg.NodeKey(peerKey)) {
e.logf("wireguard handshake complete for %v", peerKey.ShortString()) e.logf("wireguard handshake complete for %v", peerWGKey.ShortString())
// This is a modern peer with discovery support. No need to send pings. // This is a modern peer with discovery support. No need to send pings.
return return
} }
e.logf("wireguard handshake complete for %v; sending legacy pings", peerKey.ShortString()) e.logf("wireguard handshake complete for %v; sending legacy pings", peerWGKey.ShortString())
// Ping every single-IP that peer routes. // Ping every single-IP that peer routes.
// These synthetic packets are used to traverse NATs. // These synthetic packets are used to traverse NATs.
@ -328,9 +329,9 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
} }
} }
if len(ips) > 0 { if len(ips) > 0 {
go e.pinger(wgkey.Key(peerKey), ips) go e.pinger(peerWGKey, ips)
} else { } else {
logf("[unexpected] peer %s has no single-IP routes: %v", peerKey.ShortString(), allowedIPs) logf("[unexpected] peer %s has no single-IP routes: %v", peerWGKey.ShortString(), allowedIPs)
} }
}, },
CreateBind: e.magicConn.CreateBind, CreateBind: e.magicConn.CreateBind,