whisper: fixed broadcast race
Whisper's expire and broadcast loops happen in two separate go routines. Whenever an envelope is being expired it's removed from the set of envelopes and it looses all information about the envelope, including the "known hash". After the envelope has been removed it can be re-accepted by a broadcasting peer putting back the envelope in the set of envelopes. Since the envelope broadcast loop is separate of the expire loop expired messages may be broadcast to other peer, resulting in messages **never** being dropped. This PR includes an expire check before adding new messages to the set of envelopes.
This commit is contained in:
@@ -234,6 +234,11 @@ func (self *Whisper) add(envelope *Envelope) error {
|
||||
self.poolMu.Lock()
|
||||
defer self.poolMu.Unlock()
|
||||
|
||||
// short circuit when a received envelope has already expired
|
||||
if envelope.Expiry <= uint32(time.Now().Unix()) {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Insert the message into the tracked pool
|
||||
hash := envelope.Hash()
|
||||
if _, ok := self.messages[hash]; ok {
|
||||
|
Reference in New Issue
Block a user