Changeset 4ed9c8c

Timestamp:

2010-03-21T15:10:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a81d679

Parents:

2e89256

Message:

Fixed 100% CPU usage bug in dcc.c.

Files:

• dcc.c (modified) (2 diffs)
• dcc.h (modified) (1 diff)

dcc.c

@@ -294 +294 @@
         if( cond & GAIM_INPUT_READ ) 
         {
-                int bytes_received;
                 int ret;
                 
-                ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received ), MSG_PEEK ), "Receiving" );
+                ASSERTSOCKOP( ret = recv( fd, ( (char*) &df->acked ) + df->acked_len,
+                        sizeof( df->acked ) - df->acked_len, 0 ), "Receiving" );
 
                 if( ret == 0 )
                         return dcc_abort( df, "Remote end closed connection" );
-                        
-                if( ret < 4 )
-                {
-                        imcb_log( df->ic, "WARNING: DCC SEND: receiver sent only %d bytes instead of 4, shouldn't happen too often!", ret );
+                
+                /* How likely is it that a 32-bit integer gets split accross
+                   packet boundaries? Chances are rarely 0 so let's be sure. */
+                if( ( df->acked_len = ( df->acked_len + ret ) % 4 ) > 0 )
                         return TRUE;
-                }
-
-                ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received ), 0 ), "Receiving" );
-                if( ret != 4 )
-                        return dcc_abort( df, "MSG_PEEK'ed 4, but can only dequeue %d bytes", ret );
-
-                bytes_received = ntohl( bytes_received );
+
+                df->acked = ntohl( df->acked );
 
                 /* If any of this is actually happening, the receiver should buy a new IRC client */
 
-                if ( bytes_received > df->bytes_sent )
-                        return dcc_abort( df, "Receiver magically received more bytes than sent ( %d > %d ) (BUG at receiver?)", bytes_received, df->bytes_sent );
-
-                if ( bytes_received < file->bytes_transferred )
-                        return dcc_abort( df, "Receiver lost bytes? ( has %d, had %d ) (BUG at receiver?)", bytes_received, file->bytes_transferred );
+                if ( df->acked > df->bytes_sent )
+                        return dcc_abort( df, "Receiver magically received more bytes than sent ( %d > %d ) (BUG at receiver?)", df->acked, df->bytes_sent );
+
+                if ( df->acked < file->bytes_transferred )
+                        return dcc_abort( df, "Receiver lost bytes? ( has %d, had %d ) (BUG at receiver?)", df->acked, file->bytes_transferred );
                 
-                file->bytes_transferred = bytes_received;
+                file->bytes_transferred = df->acked;
         
                 if( file->bytes_transferred >= file->file_size ) {
@@ -412 +407 @@
                     done )
                 {
-                        int ack, ackret;
-                        ack = htonl( ft->bytes_transferred = df->bytes_sent );
+                        guint32 ack = htonl( ft->bytes_transferred = df->bytes_sent );
+                        int ackret;
 
                         ASSERTSOCKOP( ackret = send( fd, &ack, 4, 0 ), "Sending DCC ACK" );

dcc.h

@@ -77 +77 @@
         size_t bytes_sent;
         
+        /*
+         * Handle the wonderful sadly-not-deprecated ACKs.
+         */
+        guint32 acked;
+        int acked_len;
+        
         /* imc's handle */
         file_transfer_t *ft;