interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16146 from status-im/pombeirp/whisperv6-peer-race-cond-fix 

Fix race condition in whisperv6/peer.go
This commit is contained in:
Guillaume Ballet 2018-02-23 11:49:47 +01:00 committed by GitHub
parent 44d40ffce1 34d94e22d9
commit fb5d085234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
whisper/whisperv6/peer.go
View File

@ -19,6 +19,7 @@ package whisperv6
import ( import (
"fmt" "fmt"
"math" "math"
"sync"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -36,6 +37,7 @@ type Peer struct {
trusted bool trusted bool
powRequirement float64 powRequirement float64
bloomMu sync.Mutex
bloomFilter []byte bloomFilter []byte
fullNode bool fullNode bool
@ -225,10 +227,14 @@ func (peer *Peer) notifyAboutBloomFilterChange(bloom []byte) error {
} }
func (peer *Peer) bloomMatch(env *Envelope) bool { func (peer *Peer) bloomMatch(env *Envelope) bool {
peer.bloomMu.Lock()
defer peer.bloomMu.Unlock()
return peer.fullNode || bloomFilterMatch(peer.bloomFilter, env.Bloom()) return peer.fullNode || bloomFilterMatch(peer.bloomFilter, env.Bloom())
} }
func (peer *Peer) setBloomFilter(bloom []byte) { func (peer *Peer) setBloomFilter(bloom []byte) {
peer.bloomMu.Lock()
defer peer.bloomMu.Unlock()
peer.bloomFilter = bloom peer.bloomFilter = bloom
peer.fullNode = isFullNode(bloom) peer.fullNode = isFullNode(bloom)
if peer.fullNode && peer.bloomFilter == nil { if peer.fullNode && peer.bloomFilter == nil {