lib/nat: Fix clearAddresses/notify deadlock (ref #4601) (#4829)

clearAddresses write locks the struct and then calls notify. notify in turn tries to obtain a read lock on the same mutex. The result was a deadlock. This change unlocks the struct before calling notify.
This commit is contained in:
Graham Miln
2018-03-21 08:02:32 +01:00
committed by Jakob Borg
parent ac2e9b0e09
commit e7dc2f9190
2 changed files with 17 additions and 2 deletions

View File

@@ -53,11 +53,11 @@ func (m *Mapping) clearAddresses() {
removed = append(removed, addr)
delete(m.extAddresses, id)
}
m.expires = time.Time{}
m.mut.Unlock()
if len(removed) > 0 {
m.notify(nil, removed)
}
m.expires = time.Time{}
m.mut.Unlock()
}
func (m *Mapping) notify(added, removed []Address) {