nat: add locks around nat

libp2p · Sep 12, 2016 · 39eb32a · 39eb32a
1 parent 8d44239
commit 39eb32a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/p2p/nat/mapping.go b/p2p/nat/mapping.go
@@ -105,7 +105,9 @@ func (m *mapping) ExternalAddr() (ma.Multiaddr, error) {
 		return nil, ErrNoMapping
 	}
 
+	m.nat.natmu.Lock()
 	ip, err := m.nat.nat.GetExternalAddress()
+	m.nat.natmu.Unlock()
 	if err != nil {
 		return nil, err
 	}

diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
@@ -52,8 +52,9 @@ func DiscoverNAT() *NAT {
 // service that will periodically renew port mappings,
 // and keep an up-to-date list of all the external addresses.
 type NAT struct {
-	nat  nat.NAT
-	proc goprocess.Process // manages nat mappings lifecycle
+	natmu sync.Mutex
+	nat   nat.NAT
+	proc  goprocess.Process // manages nat mappings lifecycle
 
 	mappingmu sync.RWMutex // guards mappings
 	mappings  map[*mapping]struct{}
@@ -170,11 +171,13 @@ func (nat *NAT) establishMapping(m *mapping) {
 		comment = "libp2p-" + m.comment
 	}
 
+	nat.natmu.Lock()
 	newport, err := nat.nat.AddPortMapping(m.Protocol(), m.InternalPort(), comment, MappingDuration)
 	if err != nil {
 		// Some hardware does not support mappings with timeout, so try that
 		newport, err = nat.nat.AddPortMapping(m.Protocol(), m.InternalPort(), comment, 0)
 	}
+	nat.natmu.Lock()
 
 	failure := func() {
 		m.setExternalPort(0) // clear mapping