Changes in / [df417ca:b72caac]

Files:

• bitlbee.c (modified) (1 diff)
• ipc.c (modified) (5 diffs)
• irc.c (modified) (6 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (3 diffs)
• storage_text.c (modified) (2 diffs)

bitlbee.c

@@ -228 +228 @@
                 irc->w_watch_source_id = 0;
                 
-                if( irc->status == USTATUS_SHUTDOWN )
+                if( irc->status & USTATUS_SHUTDOWN )
                         irc_free( irc );
                 

ipc.c

@@ -115 +115 @@
 static void ipc_child_cmd_wallops( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -124 +124 @@
 static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -133 +133 @@
 static void ipc_child_cmd_opermsg( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -154 +154 @@
 static void ipc_child_cmd_kill( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -166 +166 @@
 static void ipc_child_cmd_hello( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 ipc_to_master_str( "HELLO\r\n" );
         else

irc.c

@@ -177 +177 @@
         }
         
-        irc->status = USTATUS_SHUTDOWN;
+        irc->status |= USTATUS_SHUTDOWN;
         if( irc->sendbuffer && !immed )
         {
@@ -211 +211 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
                 if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
@@ -707 +707 @@
         if( irc->user && irc->nick )
         {
-                if( global.conf->authmode == AUTHMODE_CLOSED && irc->status < USTATUS_AUTHORIZED )
+                if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
                 {
                         irc_reply( irc, 464, ":This server is password-protected." );
@@ -764 +764 @@
                 ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
         
-        irc->status = USTATUS_LOGGED_IN;
+        irc->status |= USTATUS_LOGGED_IN;
 }
 
@@ -905 +905 @@
 void irc_kill( irc_t *irc, user_t *u )
 {
-        char *nick;
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
+        char *nick, *s;
+        char reason[64];
+        
+        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
+        {
+                if( u->gc->user->proto_opt[0][0] )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->gc->user->proto_opt[0] );
+                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->gc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
         
         nick = g_strdup( u->nick );
@@ -1165 +1187 @@
         int rv = 0;
         
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
         {
                 if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )

irc.h

@@ -42 +42 @@
 {
         USTATUS_OFFLINE = 0,
-        USTATUS_AUTHORIZED,
-        USTATUS_LOGGED_IN,
-        USTATUS_IDENTIFIED,
-        USTATUS_SHUTDOWN = -1
+        USTATUS_AUTHORIZED = 1,
+        USTATUS_LOGGED_IN = 2,
+        USTATUS_IDENTIFIED = 4,
+        USTATUS_SHUTDOWN = 8
 } irc_status_t;
 

irc_commands.c

@@ -32 +32 @@
         if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
         {
-                irc->status = USTATUS_AUTHORIZED;
+                irc->status |= USTATUS_AUTHORIZED;
                 irc_check_login( irc );
         }
@@ -610 +610 @@
                         for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
                         
-                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
+                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )
                         {
                                 irc_reply( irc, 462, ":Only allowed before logging in" );
                         }
-                        else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
+                        else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) )
                         {
                                 irc_reply( irc, 451, ":Register first" );

protocols/msn/msn.c

@@ -64 +64 @@
         GSList *l;
         
-        if( md->fd >= 0 )
-                closesocket( md->fd );
-        
-        if( md->handler )
-        {
-                if( md->handler->rxq ) g_free( md->handler->rxq );
-                if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
-                g_free( md->handler );
-        }
-        
-        while( md->switchboards )
-                msn_sb_destroy( md->switchboards->data );
-        
-        if( md->msgq )
-        {
-                struct msn_message *m;
-                
-                for( l = md->msgq; l; l = l->next )
-                {
-                        m = l->data;
-                
-                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                }
-                g_slist_free( md->msgq );
+        if( md )
+        {
+                if( md->fd >= 0 )
+                        closesocket( md->fd );
+                
+                if( md->handler )
+                {
+                        if( md->handler->rxq ) g_free( md->handler->rxq );
+                        if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
+                        g_free( md->handler );
+                }
+                
+                while( md->switchboards )
+                        msn_sb_destroy( md->switchboards->data );
+                
+                if( md->msgq )
+                {
+                        struct msn_message *m;
+                        
+                        for( l = md->msgq; l; l = l->next )
+                        {
+                                m = l->data;
+                        
+                                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
+                                g_free( m->who );
+                                g_free( m->text );
+                                g_free( m );
+                        }
+                        g_slist_free( md->msgq );
+                }
+                
+                g_free( md );
         }
         
@@ -100 +105 @@
                 g_free( l->data );
         g_slist_free( gc->deny );
-        
-        g_free( md );
         
         msn_connections = g_slist_remove( msn_connections, gc );

protocols/nogaim.c

@@ -294 +294 @@
         
         serv_got_crap( gc, "Signing off.." );
-
+        
         b_event_remove( gc->keepalive );
+        gc->flags |= OPT_LOGGING_OUT;
         gc->keepalive = 0;
         gc->prpl->close( gc );

protocols/nogaim.h

@@ -54 +54 @@
 #define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
-#define OPT_CONN_HTML 0x00000001
-#define OPT_LOGGED_IN 0x00010000
 #define GAIM_AWAY_CUSTOM "Custom"
+
+#define OPT_CONN_HTML   0x00000001
+#define OPT_LOGGED_IN   0x00010000
+#define OPT_LOGGING_OUT 0x00020000
 
 /* ok. now the fun begins. first we create a connection structure */

root_commands.c

@@ -163 +163 @@
                         
                 case STORAGE_OK:
-                        irc->status = USTATUS_IDENTIFIED;
+                        irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
                         break;
@@ -187 +187 @@
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
-                irc->status = USTATUS_LOGGED_IN;
+                irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
@@ -201 +201 @@
         account_t *a;
         
-        if( global.conf->authmode == AUTHMODE_REGISTERED && irc->status < USTATUS_IDENTIFIED )
+        if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
         {
                 irc_usermsg( irc, "This server only accepts registered users" );

storage_text.c

@@ -71 +71 @@
         user_t *ru = user_find( irc, ROOT_NICK );
         
-        if( irc->status >= USTATUS_IDENTIFIED )
+        if( irc->status & USTATUS_IDENTIFIED )
                 return( 1 );
         
@@ -88 +88 @@
         /* Do this now. If the user runs with AuthMode = Registered, the
            account command will not work otherwise. */
-        irc->status = USTATUS_IDENTIFIED;
+        irc->status |= USTATUS_IDENTIFIED;
         
         while( fscanf( fp, "%511[^\n]s", s ) > 0 )