|
@@ -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 {
|