Merge pull request #2738 from nspcc-dev/dont-block-forever-2

network: don't wait indefinitely for packet to be sent

pkg/network/server.go

@@ -1385,7 +1385,7 @@ func (s *Server) iteratePeersWithSendMsg(msg *Message, send func(Peer, bool, []b
 					peer.AddGetAddrSent()
 				}
 				sentN++
-			} else if errors.Is(err, errBusy) {
+			} else if !blocking && errors.Is(err, errBusy) {
 				// Can be retried.
 				continue
 			} else {

pkg/network/tcp_peer.go

@@ -87,11 +87,18 @@ func (p *TCPPeer) putPacketIntoQueue(queue chan<- []byte, block bool, msg []byte
 	if !p.Handshaked() {
 		return errStateMismatch
 	}
+	var ret error
 	if block {
+		timer := time.NewTimer(p.server.TimePerBlock / 2)
 		select {
 		case queue <- msg:
 		case <-p.done:
-			return errGone
+			ret = errGone
+		case <-timer.C:
+			ret = errBusy
+		}
+		if !errors.Is(ret, errBusy) && !timer.Stop() {
+			<-timer.C
 		}
 	} else {
 		select {
@@ -102,7 +109,7 @@ func (p *TCPPeer) putPacketIntoQueue(queue chan<- []byte, block bool, msg []byte
 			return errBusy
 		}
 	}
-	return nil
+	return ret
 }
 
 // EnqueuePacket implements the Peer interface.