Changeset 2e89256

Timestamp:

2010-03-21T13:20:20Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4ed9c8c

Parents:

aed152f

Message:

Remove dcc_poll() and just use the cond variable passed to I/O events.

File:

• dcc.c (modified) (6 diffs)

dcc.c

@@ -26 +26 @@
 #include "ft.h"
 #include "dcc.h"
-#include <poll.h>
 #include <netinet/tcp.h>
 #include <regex.h>
@@ -260 +259 @@
 
 /*
- * Checks poll(), same for receiving and sending
- */
-gboolean dcc_poll( dcc_file_transfer_t *df, int fd, short *revents )
-{
-        struct pollfd pfd = { .fd = fd, .events = POLLHUP|POLLERR|POLLIN|POLLOUT };
-
-        ASSERTSOCKOP( poll( &pfd, 1, 0 ), "poll()" )
-
-        if( pfd.revents & POLLERR )
-        {
-                int sockerror;
-                socklen_t errlen = sizeof( sockerror );
-
-                if ( getsockopt( fd, SOL_SOCKET, SO_ERROR, &sockerror, &errlen ) )
-                        return dcc_abort( df, "getsockopt() failed, unknown socket error (weird!)" );
-
-                return dcc_abort( df, "Socket error: %s", strerror( sockerror ) );
-        }
-        
-        if( pfd.revents & POLLHUP ) 
-                return dcc_abort( df, "Remote end closed connection" );
-        
-        *revents = pfd.revents;
-
-        return TRUE;
-}
-
-/*
  * After setup, the transfer itself is handled entirely by this function.
  * There are basically four things to handle: connect, receive, send, and error.
@@ -295 +266 @@
         dcc_file_transfer_t *df = data;
         file_transfer_t *file = df->ft;
-        short revents;
-        
-        if( !dcc_poll( df, fd, &revents ) )
-                return FALSE;
-
-        if( ( revents & POLLIN ) &&
+        
+        if( ( cond & GAIM_INPUT_READ ) &&
             ( file->status & FT_STATUS_LISTENING ) )
         {       
@@ -325 +292 @@
         }
 
-        if( revents & POLLIN ) 
+        if( cond & GAIM_INPUT_READ ) 
         {
                 int bytes_received;
@@ -414 +381 @@
         dcc_file_transfer_t *df = data;
         file_transfer_t *ft = df->ft;
-        short revents;
-
-        if( !dcc_poll( df, fd, &revents ) )
-                return FALSE;
-        
-        if( ( revents & POLLOUT ) &&
+
+        if( ( cond & GAIM_INPUT_WRITE ) &&
             ( ft->status & FT_STATUS_CONNECTING ) )
         {
@@ -430 +393 @@
         }
 
-        if( revents & POLLIN )
+        if( cond & GAIM_INPUT_READ )
         {
                 int ret, done;