Changeset 14544

Timestamp:

Jun 24, 2015, 8:38:41 PM (8 years ago)

Author:

mikedld

Message:

#5964: Follow-up fix for #5456 (encrypted communication with libevent 2.1.x)

I've misread libevent documentation and the check introduced was not
entirely correct. Changed evbuffer_peek call now to only request the
data which would fit into provided iovec.

File:

• trunk/libtransmission/peer-io.c (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -1149 +1149 @@
         evbuffer_ptr_set (outbuf, &pos, old_length, EVBUFFER_PTR_SET);
         do {
-            if (evbuffer_peek (outbuf, byteCount, &pos, &iovec, 1) != 1)
+            if (evbuffer_peek (outbuf, -1, &pos, &iovec, 1) != 1)
               break;
             tr_cryptoDecrypt (&io->crypto, iovec.iov_len, iovec.iov_base, iovec.iov_base);