]> jfr.im git - solanum.git/blobdiff - src/chmode.c
can_send: properly initalise moduledata.
[solanum.git] / src / chmode.c
index 9d67ed256a0c8dd05081a60066f362a58757b809..a268fdc5d8593b16e0bbec6f1ddfab916a7b095e 100644 (file)
@@ -56,6 +56,7 @@
 #define SM_ERR_NOPRIVS          0x00000400
 #define SM_ERR_RPL_Q            0x00000800
 #define SM_ERR_RPL_F            0x00001000
+#define SM_ERR_MLOCK            0x00002000
 
 #define MAXMODES_SIMPLE 46 /* a-zA-Z except bqeIov */
 
@@ -70,14 +71,15 @@ char cflagsmyinfo[256];
 
 int chmode_flags[256];
 
+extern int h_get_channel_access;
+
 /* OPTIMIZE ME! -- dwr */
 void
-construct_noparam_modes(void)
+construct_cflags_strings(void)
 {
        int i;
         char *ptr = cflagsbuf;
        char *ptr2 = cflagsmyinfo;
-        static int prev_chmode_flags[256];
         
         *ptr = '\0';
        *ptr2 = '\0';
@@ -99,22 +101,6 @@ construct_noparam_modes(void)
                        chmode_flags[i] = 0;
                }
                 
-               if (prev_chmode_flags[i] != 0 && prev_chmode_flags[i] != chmode_flags[i])
-               {
-                       if (chmode_flags[i] == 0)
-                       {
-                                chmode_table[i].set_func = chm_orphaned;
-                               sendto_realops_snomask(SNO_DEBUG, L_ALL, "Cmode +%c is now orphaned", i);
-                       }
-                       else
-                       {
-                               sendto_realops_snomask(SNO_DEBUG, L_ALL, "Orphaned cmode +%c is picked up by module", i);
-                       }
-                       chmode_flags[i] = prev_chmode_flags[i];
-               }
-               else
-                       prev_chmode_flags[i] = chmode_flags[i];
-                
                switch (chmode_flags[i])
                {
                    case MODE_EXLIMIT:
@@ -158,7 +144,7 @@ construct_noparam_modes(void)
  *                0 if no cflags are available
  * side effects - NONE
  */
-unsigned int
+static unsigned int
 find_cflag_slot(void)
 {
        unsigned int all_cflags = 0, my_cflag = 0, i;
@@ -172,13 +158,54 @@ find_cflag_slot(void)
        return my_cflag;
 }
 
-static int
+unsigned int
+cflag_add(char c_, ChannelModeFunc function)
+{
+       int c = (unsigned char)c_;
+
+       if (chmode_table[c].set_func != chm_nosuch &&
+                       chmode_table[c].set_func != chm_orphaned)
+               return 0;
+
+       if (chmode_table[c].set_func == chm_nosuch)
+               chmode_table[c].mode_type = find_cflag_slot();
+       if (chmode_table[c].mode_type == 0)
+               return 0;
+       chmode_table[c].set_func = function;
+       construct_cflags_strings();
+       return chmode_table[c].mode_type;
+}
+
+void
+cflag_orphan(char c_)
+{
+       int c = (unsigned char)c_;
+
+       s_assert(chmode_flags[c] != 0);
+       chmode_table[c].set_func = chm_orphaned;
+       construct_cflags_strings();
+}
+
+int
 get_channel_access(struct Client *source_p, struct membership *msptr)
 {
-       if(!MyClient(source_p) || is_chanop(msptr))
+       hook_data_channel_approval moduledata;
+
+       if(!MyClient(source_p))
                return CHFL_CHANOP;
 
-       return CHFL_PEON;
+       if (msptr == NULL)
+               return CHFL_PEON;
+
+       moduledata.client = source_p;
+       moduledata.chptr = msptr->chptr;
+       moduledata.msptr = msptr;
+       moduledata.target = NULL;
+       moduledata.approved = is_chanop(msptr) ? CHFL_CHANOP : CHFL_PEON;
+
+       call_hook(h_get_channel_access, &moduledata);
+
+       return moduledata.approved;
 }
 
 /* add_id()
@@ -687,8 +714,8 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
        case CHFL_QUIET:
                list = &chptr->quietlist;
                errorval = SM_ERR_RPL_Q;
-               rpl_list = RPL_BANLIST;
-               rpl_endlist = RPL_ENDOFBANLIST;
+               rpl_list = RPL_QUIETLIST;
+               rpl_endlist = RPL_ENDOFQUIETLIST;
                mems = ALL_MEMBERS;
                caps = 0;
                break;
@@ -723,10 +750,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                                   me.name, source_p->name, chptr->chname,
                                   banptr->banstr, banptr->who, banptr->when);
                }
-               if (mode_type == CHFL_QUIET)
-                       sendto_one(source_p, ":%s %d %s %s :End of Channel Quiet List", me.name, rpl_endlist, source_p->name, chptr->chname);
-               else
-                       sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
+               sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
                return;
        }
 
@@ -861,7 +885,7 @@ chm_op(struct Client *source_p, struct Channel *chptr,
 
        if(dir == MODE_ADD)
        {
-               if(targ_p == source_p)
+               if(targ_p == source_p && mstptr->flags & CHFL_CHANOP)
                        return;
 
                mode_changes[mode_count].letter = c;
@@ -1290,44 +1314,6 @@ chm_key(struct Client *source_p, struct Channel *chptr,
        }
 }
 
-void
-chm_regonly(struct Client *source_p, struct Channel *chptr,
-           int alevel, int parc, int *parn,
-           const char **parv, int *errors, int dir, char c, long mode_type)
-{
-       if(alevel != CHFL_CHANOP)
-       {
-               if(!(*errors & SM_ERR_NOOPS))
-                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                                  me.name, source_p->name, chptr->chname);
-               *errors |= SM_ERR_NOOPS;
-               return;
-       }
-
-       if(dir == MODE_QUERY)
-               return;
-
-       if(((dir == MODE_ADD) && (chptr->mode.mode & mode_type)) ||
-          ((dir == MODE_DEL) && !(chptr->mode.mode & mode_type)))
-               return;
-
-       if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
-       if(dir == MODE_ADD)
-               chptr->mode.mode |= mode_type;
-       else
-               chptr->mode.mode &= ~mode_type;
-
-       mode_changes[mode_count].letter = c;
-       mode_changes[mode_count].dir = dir;
-       mode_changes[mode_count].caps = CAP_SERVICE;
-       mode_changes[mode_count].nocaps = 0;
-       mode_changes[mode_count].mems = ALL_MEMBERS;
-       mode_changes[mode_count].id = NULL;
-       mode_changes[mode_count++].arg = NULL;
-}
-
 /* *INDENT-OFF* */
 struct ChannelMode chmode_table[256] =
 {
@@ -1446,7 +1432,7 @@ struct ChannelMode chmode_table[256] =
   {chm_op,     0 },                    /* o */
   {chm_simple, MODE_PRIVATE },         /* p */
   {chm_ban,    CHFL_QUIET },           /* q */
-  {chm_regonly, MODE_REGONLY },                /* r */
+  {chm_simple,  MODE_REGONLY },                /* r */
   {chm_simple, MODE_SECRET },          /* s */
   {chm_simple, MODE_TOPICLIMIT },      /* t */
   {chm_nosuch, 0 },                    /* u */
@@ -1654,6 +1640,19 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                        dir = MODE_QUERY;
                        break;
                default:
+                       /* If this mode char is locked, don't allow local users to change it. */
+                       if (MyClient(source_p) && chptr->mode_lock && strchr(chptr->mode_lock, c))
+                       {
+                               if (!(errors & SM_ERR_MLOCK))
+                                       sendto_one_numeric(source_p,
+                                                       ERR_MLOCKRESTRICTED,
+                                                       form_str(ERR_MLOCKRESTRICTED),
+                                                       chptr->chname,
+                                                       c,
+                                                       chptr->mode_lock);
+                               errors |= SM_ERR_MLOCK;
+                               continue;
+                       }
                        chmode_table[(unsigned char) c].set_func(fakesource_p, chptr, alevel,
                                       parc, &parn, parv,
                                       &errors, dir, c,
@@ -1751,3 +1750,24 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
        if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1)
                send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count);
 }
+
+/* set_channel_mlock()
+ *
+ * inputs      - client, source, channel, params
+ * output      - 
+ * side effects - channel mlock is changed / MLOCK is propagated
+ */
+void
+set_channel_mlock(struct Client *client_p, struct Client *source_p,
+                 struct Channel *chptr, const char *newmlock, int propagate)
+{
+       rb_free(chptr->mode_lock);
+       chptr->mode_lock = newmlock ? rb_strdup(newmlock) : NULL;
+
+       if (propagate)
+       {
+               sendto_server(client_p, NULL, CAP_TS6 | CAP_MLOCK, NOCAPS, ":%s MLOCK %ld %s :%s",
+                             source_p->id, (long) chptr->channelts, chptr->chname,
+                             chptr->mode_lock ? chptr->mode_lock : "");
+       }
+}