Changeset 7747

Timestamp:

Jan 19, 2009, 1:55:41 PM (13 years ago)

Author:

charles

Message:

(trunk libT) possible fix for the `few peers' errors reported on OS X. denis_, merlyn3d, give this a spin...

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (4 diffs)
• peer-io.h (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -191 +191 @@
     assert( tr_isPeerIo( io ) );
 
+    io->hasFinishedConnecting = TRUE;
+
     curlen = EVBUFFER_LENGTH( io->inbuf );
     howmuch = curlen >= max ? 0 : max - curlen;
@@ -271 +273 @@
     assert( tr_isPeerIo( io ) );
 
+    io->hasFinishedConnecting = TRUE;
+
     dbgmsg( io, "libevent says this peer is ready to write" );
 
@@ -353 +357 @@
     io->socket = socket;
     io->isIncoming = isIncoming != 0;
+    io->hasFinishedConnecting = FALSE;
     io->timeCreated = time( NULL );
     io->inbuf = evbuffer_new( );
@@ -822 +827 @@
     assert( tr_isDirection( dir ) );
 
-    if( dir == TR_DOWN )
-        bytesUsed = tr_peerIoTryRead( io, limit );
-    else
-        bytesUsed = tr_peerIoTryWrite( io, limit );
+    if( io->hasFinishedConnecting )
+    {
+        if( dir == TR_DOWN )
+            bytesUsed = tr_peerIoTryRead( io, limit );
+        else
+            bytesUsed = tr_peerIoTryWrite( io, limit );
+    }
 
     dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %zd", (int)dir, limit, bytesUsed );

trunk/libtransmission/peer-io.h

@@ -65 +65 @@
     tr_bool               fastExtensionSupported;
 
+    /* we create the socket in a nonblocking way, so this flag is initially
+     * false and then set to true when libevent says that the socket is ready
+     * for reading or writing */
+    tr_bool               hasFinishedConnecting;
+
     int                   magicNumber;