Changeset b919363 for irc.c

Timestamp:

2010-03-27T14:31:03Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2f53ada

Parents:

9b69eb7

Message:

Mode stuff. Also disallow unsetting +R umode which was possible so far
(and shouldn't be).

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -52 +52 @@
         irc->nick_user_hash = g_hash_table_new( g_str_hash, g_str_equal );
         irc->watches = g_hash_table_new( g_str_hash, g_str_equal );
-        
-        strcpy( irc->umode, UMODE );
         
         irc->iconv = (GIConv) -1;
@@ -599 +597 @@
                         g_free( iu );
                         
-                        irc->umode[0] = '\0';
-                        /*irc_umode_set( irc, "+" UMODE, 1 );*/
-                        
                         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
                                 ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
@@ -619 +614 @@
                         irc_send_login( irc );
                         
+                        irc->umode[0] = '\0';
+                        irc_umode_set( irc, "+" UMODE, TRUE );
+                        
                         ic = irc_channel_new( irc, ROOT_CHAN );
                         irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
@@ -631 +629 @@
                 return 0;
         }
+}
+
+void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv )
+{
+        /* allow_priv: Set to 0 if s contains user input, 1 if you want
+           to set a "privileged" mode (+o, +R, etc). */
+        char m[128], st = 1;
+        const char *t;
+        int i;
+        char changes[512], *p, st2 = 2;
+        char badflag = 0;
+        
+        memset( m, 0, sizeof( m ) );
+        
+        for( t = irc->umode; *t; t ++ )
+                if( *t < sizeof( m ) )
+                        m[(int)*t] = 1;
+        
+        p = changes;
+        for( t = s; *t; t ++ )
+        {
+                if( *t == '+' || *t == '-' )
+                        st = *t == '+';
+                else if( ( st == 0 && ( !strchr( UMODES_KEEP, *t ) || allow_priv ) ) ||
+                         ( st == 1 && strchr( UMODES, *t ) ) ||
+                         ( st == 1 && allow_priv && strchr( UMODES_PRIV, *t ) ) )
+                {
+                        if( m[(int)*t] != st)
+                        {
+                                if( st != st2 )
+                                        st2 = st, *p++ = st ? '+' : '-';
+                                *p++ = *t;
+                        }
+                        m[(int)*t] = st;
+                }
+                else
+                        badflag = 1;
+        }
+        *p = '\0';
+        
+        memset( irc->umode, 0, sizeof( irc->umode ) );
+        
+        for( i = 'A'; i <= 'z' && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
+                if( m[i] )
+                        irc->umode[strlen(irc->umode)] = i;
+        
+        if( badflag )
+                irc_send_num( irc, 501, ":Unknown MODE flag" );
+        if( *changes )
+                irc_write( irc, ":%s!%s@%s MODE %s :%s", irc->user->nick,
+                           irc->user->user, irc->user->host, irc->user->nick,
+                           changes );
 }