From e51accb3e2eee6206b4f6a1b3844bc3fd00649ae Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 19 Oct 2021 13:36:37 +1100 Subject: [PATCH] Don't error receiving unchoke while already unchoked --- peerconn.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/peerconn.go b/peerconn.go index 2d272269..2b27706a 100644 --- a/peerconn.go +++ b/peerconn.go @@ -1006,6 +1006,12 @@ func runSafeExtraneous(f func()) { } } +func (c *PeerConn) logProtocolBehaviour(level log.Level, format string, arg ...interface{}) { + c.logger.WithLevel(level).WithContextText(fmt.Sprintf( + "peer id %q, ext v %q", c.PeerID, c.PeerClientName, + )).Printf(format, arg...) +} + // Processes incoming BitTorrent wire-protocol messages. The client lock is held upon entry and // exit. Returning will end the connection. func (c *PeerConn) mainReadLoop() (err error) { @@ -1071,7 +1077,10 @@ func (c *PeerConn) mainReadLoop() (err error) { c.updateExpectingChunks() case pp.Unchoke: if !c.peerChoking { - return errors.New("got unchoke but not choked") + // Some clients do this for some reason. Transmission doesn't error on this, so we + // won't for consistency. + c.logProtocolBehaviour(log.Info, "received unchoke when already unchoked") + break } c.peerChoking = false preservedCount := 0 -- 2.44.0