From 3e676f603793b9996e4b44c0b525d21bee44529f Mon Sep 17 00:00:00 2001
From: Sonic <sonic@dexon.org>
Date: Mon, 11 Feb 2019 18:59:21 +0800
Subject: p2p, dex: some fixes (#189)

* p2p: try resolving direct dial when dial fail
* dex: avoid concurrent map read and map write
---
 dex/peer.go | 3 +++
 p2p/dial.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dex/peer.go b/dex/peer.go
index 67a59348d..97f42ccac 100644
--- a/dex/peer.go
+++ b/dex/peer.go
@@ -958,6 +958,9 @@ func (ps *peerSet) Close() {
 }
 
 func (ps *peerSet) BuildConnection(round uint64) {
+	ps.lock.Lock()
+	defer ps.lock.Unlock()
+
 	dkgLabel := peerLabel{set: dkgset, round: round}
 	if _, ok := ps.label2Nodes[dkgLabel]; !ok {
 		dkgPKs, err := ps.gov.DKGSet(round)
diff --git a/p2p/dial.go b/p2p/dial.go
index 99acade36..b323bdac1 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -323,7 +323,7 @@ func (t *dialTask) Do(srv *Server) {
 	if err != nil {
 		log.Trace("Dial error", "task", t, "err", err)
 		// Try resolving the ID of static nodes if dialing failed.
-		if _, ok := err.(*dialError); ok && t.flags&staticDialedConn != 0 {
+		if _, ok := err.(*dialError); ok && t.flags&(staticDialedConn|directDialedConn) != 0 {
 			if t.resolve(srv) {
 				t.dial(srv, t.dest)
 			}
-- 
cgit v1.2.3