diff options
| author | Sonic <sonic@dexon.org> | 2019-02-11 18:59:21 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:57 +0800 |
| commit | 1edb8bbb1ee823bcaba46971d292bf602a0add9f (patch) | |
| tree | 0150e8a0bd93f8244a5875fe470a5afa49d84d31 | |
| parent | 07bb51fb817b0e8db9453b185a3684c95a494342 (diff) | |
| download | dexon-1edb8bbb1ee823bcaba46971d292bf602a0add9f.tar.gz dexon-1edb8bbb1ee823bcaba46971d292bf602a0add9f.tar.zst dexon-1edb8bbb1ee823bcaba46971d292bf602a0add9f.zip | |
p2p, dex: some fixes (#189)
* p2p: try resolving direct dial when dial fail
* dex: avoid concurrent map read and map write
| -rw-r--r-- | dex/peer.go | 3 | ||||
| -rw-r--r-- | p2p/dial.go | 2 |
2 files changed, 4 insertions, 1 deletions
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) } |