personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-11-09 19:23:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

QueryServer needs to be done outside of the lock (#996)

Browse Source
This commit is contained in:
Nate Brown 2023-10-17 15:43:51 -05:00 committed by GitHub
parent e78fe0b9ef
commit 50d6a1e8ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -318,13 +318,13 @@ func (hm *HandshakeManager) GetOrHandshake(vpnIp iputil.VpnIp, cacheCb func(*Hos
// 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(*HostInfo)) *HostInfo { func (hm *HandshakeManager) StartHandshake(vpnIp iputil.VpnIp, cacheCb func(*HostInfo)) *HostInfo {
hm.Lock() hm.Lock()
defer hm.Unlock()
if hostinfo, ok := hm.vpnIps[vpnIp]; ok { if hostinfo, 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(hostinfo) cacheCb(hostinfo)
} }
hm.Unlock()
return hostinfo return hostinfo
} }
@ -361,6 +361,7 @@ func (hm *HandshakeManager) StartHandshake(vpnIp iputil.VpnIp, cacheCb func(*Hos
} }
} }
hm.Unlock()
hm.lightHouse.QueryServer(vpnIp, hm.f) hm.lightHouse.QueryServer(vpnIp, hm.f)
return hostinfo return hostinfo
} }