Changes in / [b8c2ace:55ec2d6]

Files:

• bitlbee.c (modified) (5 diffs)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)

bitlbee.c

@@ -133 +133 @@
         if( condition & G_IO_ERR || condition & G_IO_HUP )
         {
-                irc_free( irc );
+                irc_abort( irc, 1, "Read error" );
                 return FALSE;
         }
@@ -140 +140 @@
         if( st == 0 )
         {
-                irc_free( irc );
+                irc_abort( irc, 1, "Connection reset by peer" );
                 return FALSE;
         }
@@ -151 +151 @@
                 else
                 {
-                        irc_free( irc );
+                        irc_abort( irc, 1, "Read error: %s", strerror( errno ) );
                         return FALSE;
                 }
@@ -177 +177 @@
         if( irc->readbuffer && ( strlen( irc->readbuffer ) > 1024 ) )
         {
-                log_message( LOGLVL_ERROR, "Maximum line length exceeded." );
-                irc_abort( irc );
+                irc_abort( irc, 0, "Maximum line length exceeded" );
                 return FALSE;
         }
@@ -199 +198 @@
         if( st == 0 || ( st < 0 && !sockerr_again() ) )
         {
-                irc_free( irc );
+                irc_abort( irc, 1, "Write error: %s", strerror( errno ) );
                 return FALSE;
         }

irc.c

@@ -152 +152 @@
 }
 
-void irc_abort( irc_t *irc )
-{
+void irc_abort( irc_t *irc, int immed, char *format, ... )
+{
+        va_list params;
+        
+        if( format != NULL )
+        {
+                char *reason;
+                
+                va_start( params, format );
+                reason = g_strdup_printf( format, params );
+                va_end( params );
+                
+                if( !immed )
+                        irc_write( irc, "ERROR :Closing link: %s", reason );
+                
+                ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
+                                   irc->nick, irc->host, reason" );
+                
+                g_free( reason );
+        }
+        else
+        {
+                if( !immed )
+                        irc_write( irc, "ERROR :Closing link" );
+                
+                ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
+                                   irc->nick, irc->host, "No reason given" );
+        }
+        
         irc->status = USTATUS_SHUTDOWN;
-        if( irc->sendbuffer )
-        {
+        if( irc->sendbuffer && !immed )
+        {
+                /* We won't read from this socket anymore. Instead, we'll connect a timer
+                   to it that should shut down the connection in a second, just in case
+                   bitlbee_.._write doesn't do it first. */
+                
                 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 );
@@ -1115 +1146 @@
         if( rv > 0 )
         {
-                irc_write( irc, "ERROR :Closing Link: Ping Timeout: %d seconds", rv );
-                irc_free( irc );
+                irc_abort( irc, "ERROR :Closing Link: Ping Timeout: %d seconds", rv );
                 return FALSE;
         }

irc.h

@@ -105 +105 @@
 
 irc_t *irc_new( int fd );
-void irc_abort( irc_t *irc );
+void irc_abort( irc_t *irc, int immed, char *format, ... );
 void irc_free( irc_t *irc );