Changeset 07e46c9

Timestamp:

2006-06-16T11:26:51Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

c2fa827

Parents:

b4e4b95 (diff), 3af70b0 (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:

[merge] upstream

Files:

• bitlbee.c (modified) (1 diff)
• ipc.c (modified) (5 diffs)
• irc.c (modified) (5 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• root_commands.c (modified) (3 diffs)
• storage_text.c (modified) (2 diffs)

bitlbee.c

@@ -236 +236 @@
                 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

@@ -179 +179 @@
         }
         
-        irc->status = USTATUS_SHUTDOWN;
+        irc->status |= USTATUS_SHUTDOWN;
         if( irc->sendbuffer && !immed )
         {
@@ -213 +213 @@
         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!" );
@@ -701 +701 @@
         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." );
@@ -758 +758 @@
                 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;
 }
 
@@ -1181 +1181 @@
         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" );

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 )