Changeset 3859

Timestamp:

Nov 17, 2007, 5:49:30 PM (15 years ago)

Author:

charles

Message:

fix timeout error that caused us to drop connections prematurely

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (11 diffs)
• peer-msgs.c (modified) (10 diffs)

trunk/libtransmission/peer-io.c

@@ -51 +51 @@
     int socket;
     int encryptionMode;
+    int timeout;
     struct bufferevent * bufev;
     uint8_t peerId[20];
@@ -131 +132 @@
     c->socket = socket;
     c->isIncoming = isIncoming ? 1 : 0;
+    c->timeout = IO_TIMEOUT_SECS;
     c->bufev = bufferevent_new( c->socket,
                                 canReadWrapper,
@@ -136 +138 @@
                                 gotErrorWrapper,
                                 c );
-    bufferevent_settimeout( c->bufev, IO_TIMEOUT_SECS, IO_TIMEOUT_SECS );
+    bufferevent_settimeout( c->bufev, c->timeout, c->timeout );
     bufferevent_enable( c->bufev, EV_READ|EV_WRITE );
     bufferevent_setwatermark( c->bufev, EV_READ, 0, TR_RDBUF );
@@ -273 +275 @@
                                      canReadWrapper, NULL, gotErrorWrapper,
                                      io );
-        bufferevent_settimeout( io->bufev, IO_TIMEOUT_SECS, IO_TIMEOUT_SECS );
+        bufferevent_settimeout( io->bufev, io->timeout, io->timeout );
         bufferevent_enable( io->bufev, EV_READ|EV_WRITE );
         bufferevent_setwatermark( io->bufev, EV_READ, 0, TR_RDBUF );
@@ -286 +288 @@
 tr_peerIoSetTimeoutSecs( tr_peerIo * io, int secs )
 {
-    bufferevent_settimeout( io->bufev, secs, secs );
+    io->timeout = secs;
+    bufferevent_settimeout( io->bufev, io->timeout, io->timeout );
 }
 
@@ -434 +437 @@
     return io!=NULL && io->encryptionMode==PEER_ENCRYPTION_RC4;
 }
+
+/**
+***
+**/
 
 void
@@ -462 +469 @@
 
 void
+tr_peerIoWriteUint8( tr_peerIo        * io,
+                     struct evbuffer  * outbuf,
+                     uint8_t            writeme )
+{
+    tr_peerIoWriteBytes( io, outbuf, &writeme, sizeof(uint8_t) );
+}
+
+void
 tr_peerIoWriteUint16( tr_peerIo        * io,
                       struct evbuffer  * outbuf,
@@ -471 +486 @@
 
 void
-tr_peerIoWriteUint8( tr_peerIo        * io,
-                     struct evbuffer  * outbuf,
-                     uint8_t            writeme )
-{
-    tr_peerIoWriteBytes( io, outbuf, &writeme, sizeof(uint8_t) );
-}
-
-void
 tr_peerIoWriteUint32( tr_peerIo        * io,
                       struct evbuffer  * outbuf,
@@ -486 +493 @@
     tr_peerIoWriteBytes( io, outbuf, &tmp, sizeof(uint32_t) );
 }
+
+/***
+****
+***/
 
 void
@@ -512 +523 @@
 
 void
+tr_peerIoReadUint8( tr_peerIo         * io,
+                    struct evbuffer   * inbuf,
+                    uint8_t           * setme )
+{
+    tr_peerIoReadBytes( io, inbuf, setme, sizeof(uint8_t) );
+}
+
+void
 tr_peerIoReadUint16( tr_peerIo         * io,
                      struct evbuffer   * inbuf,
@@ -522 +541 @@
 
 void
-tr_peerIoReadUint8( tr_peerIo         * io,
-                    struct evbuffer   * inbuf,
-                    uint8_t           * setme )
-{
-    tr_peerIoReadBytes( io, inbuf, setme, sizeof(uint8_t) );
-}
-
-void
 tr_peerIoReadUint32( tr_peerIo         * io,
                      struct evbuffer   * inbuf,

trunk/libtransmission/peer-msgs.c

@@ -69 +69 @@
 
     PEX_INTERVAL            = (60 * 1000), /* msec between calls to sendPex() */
-    PEER_PULSE_INTERVAL     = (100),       /* msec between calls to pulse() */
+    PEER_PULSE_INTERVAL     = (250),       /* msec between calls to pulse() */
     RATE_PULSE_INTERVAL     = (333),       /* msec between calls to ratePulse() */
      
@@ -889 +889 @@
         msgs->state = AWAITING_BT_ID;
     }
-dbgmsg( msgs, "readBtLength: got a length of %d, msgs->state is now %d", (int)len, (int)msgs->state );
 
     return READ_AGAIN;
@@ -1086 +1085 @@
     const size_t startBufLen = EVBUFFER_LENGTH( inbuf );
 
-dbgmsg( msgs, "in readBtMessage" );
-
     --msglen; // id length
 
-    if( inlen < msglen ) {
-        dbgmsg( msgs, " too short!!! " );
+    if( inlen < msglen )
         return READ_MORE;
-    }
 
     dbgmsg( msgs, "got BT id %d, len %d, buffer size is %d", (int)id, (int)msglen, (int)inlen );
@@ -1231 +1226 @@
     }
 
-    dbgmsg( msgs, "startBufLen was %d, msglen was %d, current inbuf len is %d", (int)startBufLen, (int)(msglen+1), (int)EVBUFFER_LENGTH(inbuf) );
-
     assert( msglen + 1 == msgs->incoming.length );
     assert( EVBUFFER_LENGTH(inbuf) == startBufLen - msglen );
@@ -1299 +1292 @@
 gotBadPiece( tr_peermsgs * msgs, uint32_t pieceIndex )
 {
-    const uint32_t byteCount = tr_torPieceCountBytes( msgs->torrent, (int)pieceIndex );
+    const uint32_t byteCount =
+        tr_torPieceCountBytes( msgs->torrent, (int)pieceIndex );
     reassignBytesToCorrupt( msgs, byteCount );
 }
@@ -1318 +1312 @@
 
 static int
-clientGotBlock( tr_peermsgs * msgs, const uint8_t * data, const struct peer_request * req )
+clientGotBlock( tr_peermsgs                * msgs,
+                const uint8_t              * data,
+                const struct peer_request  * req )
 {
     int i;
@@ -1409 +1405 @@
     struct evbuffer * inbuf = EVBUFFER_INPUT ( evin );
     const size_t buflen = EVBUFFER_LENGTH( inbuf );
-    const size_t inlen = MIN( buflen, getDownloadMax( msgs ) );
-
-    if( !inlen )
+    const size_t n = MIN( buflen, getDownloadMax( msgs ) );
+
+    if( !n )
     {
         ret = READ_DONE;
@@ -1417 +1413 @@
     else switch( msgs->state )
     {
-        case AWAITING_BT_LENGTH:  ret = readBtLength ( msgs, inbuf, inlen ); break;
-        case AWAITING_BT_ID:      ret = readBtId     ( msgs, inbuf, inlen ); break;
-        case AWAITING_BT_MESSAGE: ret = readBtMessage( msgs, inbuf, inlen ); break;
-        case AWAITING_BT_PIECE:   ret = readBtPiece  ( msgs, inbuf, inlen ); break;
+        case AWAITING_BT_LENGTH:  ret = readBtLength ( msgs, inbuf, n ); break;
+        case AWAITING_BT_ID:      ret = readBtId     ( msgs, inbuf, n ); break;
+        case AWAITING_BT_MESSAGE: ret = readBtMessage( msgs, inbuf, n ); break;
+        case AWAITING_BT_PIECE:   ret = readBtPiece  ( msgs, inbuf, n ); break;
         default: assert( 0 );
     }
@@ -1442 +1438 @@
 {
     /* don't let our outbuffer get too large */
-    if( tr_peerIoWriteBytesWaiting( msgs->io ) > 4096 )
-        return FALSE;
-
-    return TRUE;
+    return tr_peerIoWriteBytesWaiting( msgs->io ) < 4096;
 }
 
@@ -1557 +1550 @@
 gotError( struct bufferevent * evbuf UNUSED, short what, void * vmsgs )
 {
-    dbgmsg( vmsgs, "libevent got an error! what=%d, errno=%d (%s)",
-            (int)what, errno, strerror(errno) );
-    fireGotError( vmsgs );
+    if( what & EVBUFFER_TIMEOUT )
+        dbgmsg( vmsgs, "libevent got a timeout, what=%hd", what );
+
+    if( what & ( EVBUFFER_EOF | EVBUFFER_ERROR ) ) {
+        dbgmsg( vmsgs, "libevent got an error! what=%hd, errno=%d (%s)",
+                what, errno, strerror(errno) );
+        fireGotError( vmsgs );
+    }
 }