Changeset 92ad3d4 for irc.c

Timestamp:

2006-01-18T22:15:09Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e8f8b18

Parents:

d990997 (diff), c1826c6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging changes from laptop: Now tries to empty sendbuffer before closing the connection,
and fixed some error checking flaw in bitlbee_io_current_client_write() that was also
present in the _read() version before 0.99 (and actually caused the 100% CPU bug that kept
us from releasing 1.0).

File:

• irc.c (modified) (3 diffs)

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 );
         }