Changeset b919363

Timestamp:

2010-03-27T14:31:03Z (15 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).

Files:

• irc.c (modified) (4 diffs)
• irc.h (modified) (3 diffs)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (3 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 );
 }
 

irc.h

@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "abisw"
-#define UMODES_PRIV "Ro"
-#define CMODES "nt"
-#define CMODE "t"
-#define UMODE "s"
-#define CTYPES "&#"
+#define UMODES "abisw"     /* Allowed umodes (although they mostly do nothing) */
+#define UMODES_PRIV "Ro"   /* Allowed, but not by user directly */
+#define UMODES_KEEP "R"    /* Don't allow unsetting using /MODE */
+#define CMODES "nt"        /* Allowed modes */
+#define CMODE "t"          /* Default mode */
+#define UMODE "s"          /* Default mode */
+
+#define CTYPES "&#"        /* Valid channel name prefixes */
 
 typedef enum
@@ -144 +146 @@
 int irc_check_login( irc_t *irc );
 
+void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv );
+
 /* irc_channel.c */
 irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
@@ -151 +155 @@
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu );
 int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *who );
+gboolean irc_channel_name_ok( const char *name );
 
 /* irc_commands.c */

irc_channel.c

@@ -127 +127 @@
         return 1;
 }
+
+gboolean irc_channel_name_ok( const char *name )
+{
+        return strchr( CTYPES, name[0] ) != NULL && nick_ok( name + 1 );
+}

irc_commands.c

@@ -184 +184 @@
 }
 
+static void irc_cmd_mode( irc_t *irc, char **cmd )
+{
+        if( irc_channel_name_ok( cmd[1] ) )
+        {
+                irc_channel_t *ic;
+                
+                if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+                        irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+                else if( cmd[2] )
+                {
+                        if( *cmd[2] == '+' || *cmd[2] == '-' )
+                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
+                        else if( *cmd[2] == 'b' )
+                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
+                }
+                else
+                        irc_send_num( irc, 324, "%s +%s", cmd[1], ic->mode );
+        }
+        else
+        {
+                if( nick_cmp( cmd[1], irc->user->nick ) == 0 )
+                {
+                        if( cmd[2] )
+                                irc_umode_set( irc, cmd[2], 0 );
+                        else
+                                irc_send_num( irc, 221, "+%s", irc->umode );
+                }
+                else
+                        irc_send_num( irc, 502, ":Don't touch their modes" );
+        }
+}
+
 #if 0
 //#if 0
@@ -199 +231 @@
         {
                 irc_send_num( irc, 432, ":Incorrect password" );
-        }
-}
-
-static void irc_cmd_mode( irc_t *irc, char **cmd )
-{
-        if( strchr( CTYPES, *cmd[1] ) )
-        {
-                if( cmd[2] )
-                {
-                        if( *cmd[2] == '+' || *cmd[2] == '-' )
-                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
-                        else if( *cmd[2] == 'b' )
-                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
-                }
-                else
-                        irc_send_num( irc, 324, "%s +%s", cmd[1], CMODE );
-        }
-        else
-        {
-                if( nick_cmp( cmd[1], irc->nick ) == 0 )
-                {
-                        if( cmd[2] )
-                                irc_umode_set( irc, cmd[2], 0 );
-                        else
-                                irc_send_num( irc, 221, "+%s", irc->umode );
-                }
-                else
-                        irc_send_num( irc, 502, ":Don't touch their modes" );
         }
 }
@@ -566 +570 @@
         { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
         { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
+        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
 #if 0
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
-        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
         { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
         { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },