Changeset c1826c6

Timestamp:

2006-01-18T18:25:31Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4c266f2, 92ad3d4

Parents:

ac9f0e9

Message:

BitlBee now tries to empty sendbuffer before closing the connection.

Files:

• bitlbee.c (modified) (4 diffs)
• irc.c (modified) (3 diffs)
• irc.h (modified) (2 diffs)

bitlbee.c

@@ -200 +200 @@
         {
                 log_message( LOGLVL_INFO, "Destroying connection with fd %d.", irc->fd );
-                irc_free( irc );
+                irc_abort( irc );
                 return FALSE;
         } 
@@ -208 +208 @@
         {
                 log_message( LOGLVL_ERROR, "Maximum line length exceeded." );
-                irc_free( irc );
+                irc_abort( irc );
                 return FALSE;
         }
@@ -227 +227 @@
         st = write( irc->fd, irc->sendbuffer, size );
         
-        if( st <= 0 )
-        {
-                if( sockerr_again() )
-                {
-                        return TRUE;
-                }
-                else
-                {
-                        irc_free( irc );
-                        return FALSE;
-                }
+        if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        {
+                irc_free( irc );
+                return FALSE;
+        }
+        else if( st < 0 ) /* && sockerr_again() */
+        {
+                return TRUE;
         }
         
@@ -244 +241 @@
                 g_free( irc->sendbuffer );
                 irc->sendbuffer = NULL;
-                
                 irc->w_watch_source_id = 0;
+                
+                if( irc->status == USTATUS_SHUTDOWN )
+                        irc_free( irc );
+                
                 return( FALSE );
         }

irc.c

@@ -151 +151 @@
 }
 
+void irc_abort( irc_t *irc )
+{
+        irc->status = USTATUS_SHUTDOWN;
+        if( irc->sendbuffer )
+        {
+                g_source_remove( irc->r_watch_source_id );
+                irc->r_watch_source_id = g_timeout_add_full( G_PRIORITY_HIGH, 1000, (GSourceFunc) irc_free, irc, NULL );
+        }
+        else
+        {
+                irc_free( irc );
+        }
+}
+
 static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
 {
@@ -159 +173 @@
 
 /* Because we have no garbage collection, this is quite annoying */
-void irc_free(irc_t * irc)
+void irc_free( irc_t * irc )
 {
         account_t *account, *accounttmp;
@@ -496 +510 @@
         {
                 irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-                g_io_channel_close( irc->io_channel );
+                /* g_io_channel_close( irc->io_channel ); */
                 return( 0 );
         }

irc.h

@@ -44 +44 @@
         USTATUS_AUTHORIZED,
         USTATUS_LOGGED_IN,
-        USTATUS_IDENTIFIED
+        USTATUS_IDENTIFIED,
+        USTATUS_SHUTDOWN
 } irc_status_t;
 
@@ -104 +105 @@
 
 irc_t *irc_new( int fd );
+void irc_abort( irc_t *irc );
 void irc_free( irc_t *irc );