poll: Fix potential deadlock and wrong cond order

The `else` statement of the sendMessage function as accidentally attached to the inner condition and could cause a deadlock when on back to back error sendind out the poll to the same peer Signed-off-by: Peter Neuroth <[email protected]>
YusukeShimizu · Aug 2, 2023 · 4463394 · 4463394
1 parent 21471ae
commit 4463394
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/poll/service.go b/poll/service.go
@@ -274,11 +274,11 @@ func (s *Service) sendMessage(peer string, msg []byte, msgType int) {
 		if _, seen := s.loggedDisconnect[peer]; !seen {
 			log.Debugf("poll_service: could not send msg to %s: %v", peer, err)
 			s.loggedDisconnect[peer] = struct{}{}
-		} else {
-			s.Lock()
-			defer s.Unlock()
-			// Message could be sent. Release peer from `loggedDisconnect`.
-			delete(s.loggedDisconnect, peer)
 		}
+	} else {
+		s.Lock()
+		defer s.Unlock()
+		// Message could be send. Release peer from `loggedDisconnect`.
+		delete(s.loggedDisconnect, peer)
 	}
 }