cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 15:20:30 +00:00
Code Releases Activity

Merge pull request #189 from neilalexander/threadsafe

Browse Source 
Fix a concurrent map read-write when removing peers
This commit is contained in:
Neil Alexander 2018-10-08 23:00:15 +01:00 committed by GitHub
commit 1233371962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/yggdrasil/peer.go
View File

@ -127,7 +127,7 @@ func (ps *peers) removePeer(port switchPort) {
return return
} // Can't remove self peer } // Can't remove self peer
ps.core.router.doAdmin(func() { ps.core.router.doAdmin(func() {
ps.core.switchTable.unlockedRemovePeer(port) ps.core.switchTable.forgetPeer(port)
}) })
ps.mutex.Lock() ps.mutex.Lock()
oldPorts := ps.getPorts() oldPorts := ps.getPorts()

4
src/yggdrasil/switch.go
View File

@ -242,7 +242,9 @@ func (t *switchTable) cleanRoot() {
// Removes a peer. // Removes a peer.
// Must be called by the router mainLoop goroutine, e.g. call router.doAdmin with a lambda that calls this. // Must be called by the router mainLoop goroutine, e.g. call router.doAdmin with a lambda that calls this.
// If the removed peer was this node's parent, it immediately tries to find a new parent. // If the removed peer was this node's parent, it immediately tries to find a new parent.
func (t *switchTable) unlockedRemovePeer(port switchPort) { func (t *switchTable) forgetPeer(port switchPort) {
t.mutex.Lock()
defer t.mutex.Unlock()
delete(t.data.peers, port) delete(t.data.peers, port)
t.updater.Store(&sync.Once{}) t.updater.Store(&sync.Once{})
if port != t.parent { if port != t.parent {