Merge pull request #69 from ipfs/fix/nat-cache-sync

fix minor race condition in nat detection code

p2p/nat/nat.go

@@ -164,6 +164,7 @@ type mapping struct {
 
 	cached    ma.Multiaddr
 	cacheTime time.Time
+	cacheLk   sync.Mutex
 }
 
 func (m *mapping) NAT() *NAT {
@@ -203,8 +204,12 @@ func (m *mapping) InternalAddr() ma.Multiaddr {
 }
 
 func (m *mapping) ExternalAddr() (ma.Multiaddr, error) {
-	if time.Now().Sub(m.cacheTime) < CacheTime {
-		return m.cached, nil
+	m.cacheLk.Lock()
+	ctime := m.cacheTime
+	cval := m.cached
+	m.cacheLk.Unlock()
+	if time.Now().Sub(ctime) < CacheTime {
+		return cval, nil
 	}
 
 	if m.ExternalPort() == 0 { // dont even try right now.
@@ -234,8 +239,10 @@ func (m *mapping) ExternalAddr() (ma.Multiaddr, error) {
 
 	maddr2 := ipmaddr.Encapsulate(tcp)
 
+	m.cacheLk.Lock()
 	m.cached = maddr2
 	m.cacheTime = time.Now()
+	m.cacheLk.Unlock()
 	return maddr2, nil
 }