forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: fix a data race on HandshakeController.keyC

Browse source
This commit is contained in:
Janos Guljas 2019-02-25 13:49:16 +01:00
parent aaa11f30be
commit 2e2baf28ea
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
swarm/pss/handshake.go
View file

@ -106,6 +106,7 @@ func NewHandshakeParams() *HandshakeParams {
type HandshakeController struct { type HandshakeController struct {
pss *Pss pss *Pss
keyC map[string]chan []string // adds a channel to report when a handshake succeeds keyC map[string]chan []string // adds a channel to report when a handshake succeeds
keyCMu sync.Mutex // protects keyC map
lock sync.Mutex lock sync.Mutex
symKeyRequestTimeout time.Duration symKeyRequestTimeout time.Duration
symKeyExpiryTimeout time.Duration symKeyExpiryTimeout time.Duration
@ -442,6 +443,8 @@ func (ctl *HandshakeController) sendKey(pubkeyid string, topic *Topic, keycount
// Enables callback for keys received from a key exchange request // Enables callback for keys received from a key exchange request
func (ctl *HandshakeController) alertHandshake(pubkeyid string, symkeys []string) chan []string { func (ctl *HandshakeController) alertHandshake(pubkeyid string, symkeys []string) chan []string {
ctl.keyCMu.Lock()
defer ctl.keyCMu.Unlock()
if len(symkeys) > 0 { if len(symkeys) > 0 {
if _, ok := ctl.keyC[pubkeyid]; ok { if _, ok := ctl.keyC[pubkeyid]; ok {
ctl.keyC[pubkeyid] <- symkeys ctl.keyC[pubkeyid] <- symkeys