From b7ecc495c309e91ba8514a3aa9a38d92a89057f0 Mon Sep 17 00:00:00 2001
From: Vlad <gluk256@gmail.com>
Date: Wed, 20 Dec 2017 09:18:48 +0200
Subject: [PATCH] whisper: process all received envelopes, do not send empty
 bundle

---
 whisper/whisperv6/peer.go    | 20 ++++++++++----------
 whisper/whisperv6/whisper.go | 13 ++++++++++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go
index be6fc68c3b..ffc39505ef 100644
--- a/whisper/whisperv6/peer.go
+++ b/whisper/whisperv6/peer.go
@@ -157,17 +157,17 @@ func (p *Peer) broadcast() error {
 		}
 	}
 
-	// transmit the unknown batch (potentially empty)
-	if err := p2p.Send(p.ws, messagesCode, bundle); err != nil {
-		return err
-	}
-
-	// mark envelopes only if they were successfully sent
-	for _, e := range bundle {
-		p.mark(e)
-	}
-
 	if len(bundle) > 0 {
+		// transmit the batch of envelopes
+		if err := p2p.Send(p.ws, messagesCode, bundle); err != nil {
+			return err
+		}
+
+		// mark envelopes only if they were successfully sent
+		for _, e := range bundle {
+			p.mark(e)
+		}
+
 		log.Trace("broadcast", "num. messages", len(bundle))
 	}
 	return nil
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index c7f1fa13c3..307d2abe34 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -520,16 +520,23 @@ func (wh *Whisper) runMessageLoop(p *Peer, rw p2p.MsgReadWriter) error {
 				log.Warn("failed to decode envelopes, peer will be disconnected", "peer", p.peer.ID(), "err", err)
 				return errors.New("invalid envelopes")
 			}
+
+			var trouble error
 			for _, env := range envelopes {
 				cached, err := wh.add(env)
-				if err != nil {
-					log.Warn("bad envelope received, peer will be disconnected", "peer", p.peer.ID(), "err", err)
-					return errors.New("invalid envelope")
+				if err != nil && trouble == nil {
+					// only report the first occurring error
+					trouble = err
 				}
 				if cached {
 					p.mark(env)
 				}
 			}
+
+			if trouble != nil {
+				log.Warn("bad envelope received, peer will be disconnected", "peer", p.peer.ID(), "err", trouble)
+				return errors.New("invalid envelope")
+			}
 		case p2pCode:
 			// peer-to-peer message, sent directly to peer bypassing PoW checks, etc.
 			// this message is not supposed to be forwarded to other peers, and