personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-11-12 13:33:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'lighthouse-query-chan-lock' into mutex-debug

Browse Source
This commit is contained in:
Wade Simmons 2024-04-11 13:25:09 -04:00
commit dffaaf38d4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handshake_manager.go
View File

@ -374,13 +374,13 @@ func (hm *HandshakeManager) GetOrHandshake(vpnIp iputil.VpnIp, cacheCb func(*Han
// StartHandshake will ensure a handshake is currently being attempted for the provided vpn ip // StartHandshake will ensure a handshake is currently being attempted for the provided vpn ip
func (hm *HandshakeManager) StartHandshake(vpnIp iputil.VpnIp, cacheCb func(*HandshakeHostInfo)) *HostInfo { func (hm *HandshakeManager) StartHandshake(vpnIp iputil.VpnIp, cacheCb func(*HandshakeHostInfo)) *HostInfo {
hm.Lock() hm.Lock()
defer hm.Unlock()
if hh, ok := hm.vpnIps[vpnIp]; ok { if hh, ok := hm.vpnIps[vpnIp]; ok {
// We are already trying to handshake with this vpn ip // We are already trying to handshake with this vpn ip
if cacheCb != nil { if cacheCb != nil {
cacheCb(hh) cacheCb(hh)
} }
hm.Unlock()
return hh.hostinfo return hh.hostinfo
} }
@ -424,6 +424,7 @@ func (hm *HandshakeManager) StartHandshake(vpnIp iputil.VpnIp, cacheCb func(*Han
} }
} }
hm.Unlock()
hm.lightHouse.QueryServer(vpnIp) hm.lightHouse.QueryServer(vpnIp)
return hostinfo return hostinfo
} }