Support more human friendly k/d/x-line duration format

[solanum.git] / ircd / chmode.c

diff --git a/ircd/chmode.c b/ircd/chmode.c
index ae3268eb460682cb4382e20231795a57adc80c25..d6d9141a4de68314896ef30f20ae1153db298f41 100644 (file)
--- a/ircd/chmode.c
+++ b/ircd/chmode.c
@@ -42,6 +42,7 @@
 #include "s_assert.h"
 #include "parse.h"
 #include "msgbuf.h"
+#include "packet.h"
 
 /* bitmasks for error returns, so we send once per call */
 #define SM_ERR_NOTS             0x00000001     /* No TS on channel */
@@ -62,8 +63,6 @@
 
 static struct ChModeChange mode_changes[BUFSIZE];
 static int mode_count;
-static int mode_limit;
-static int mode_limit_simple;
 static int mask_pos;
 static int removed_mask_pos;
 
@@ -580,9 +579,6 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
        if(!allow_mode_change(source_p, chptr, alevel, errors, c))
                return;
 
-       if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        /* setting + */
        if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
        {
@@ -660,9 +656,6 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        /* setting + */
        if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
        {
@@ -706,9 +699,6 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        /* setting + */
        if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
        {
@@ -839,10 +829,6 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
        if (!allow_mode_change(source_p, chptr, alevel, errors, c))
                return;
 
-
-       if (MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
-               return;
-
        /* empty ban, or starts with ':' which messes up s2s, ignore it */
        if (EmptyString(arg) || *arg == ':')
                return;
@@ -1001,9 +987,6 @@ chm_op(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
-               return;
-
        if(dir == MODE_ADD)
        {
                if(targ_p == source_p && mstptr->flags & CHFL_CHANOP)
@@ -1069,9 +1052,6 @@ chm_voice(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
-               return;
-
        if(dir == MODE_ADD)
        {
                mode_changes[mode_count].letter = c;
@@ -1104,9 +1084,6 @@ chm_limit(struct Client *source_p, struct Channel *chptr,
        if (!allow_mode_change(source_p, chptr, alevel, errors, c))
                return;
 
-       if (MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        if (dir == MODE_ADD)
        {
                if (EmptyString(arg) || (limit = atoi(arg)) <= 0)
@@ -1146,9 +1123,6 @@ chm_throttle(struct Client *source_p, struct Channel *chptr,
        if (!allow_mode_change(source_p, chptr, alevel, errors, c))
                return;
 
-       if (MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        if (dir == MODE_ADD)
        {
                if (sscanf(arg, "%d:%d", &joins, &timeslice) < 2)
@@ -1218,9 +1192,6 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
        }
 #endif
 
-       if (MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        if (dir == MODE_ADD)
        {
                if(EmptyString(arg))
@@ -1262,9 +1233,6 @@ chm_key(struct Client *source_p, struct Channel *chptr,
        if (!allow_mode_change(source_p, chptr, alevel, errors, c))
                return;
 
-       if (MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
-               return;
-
        if (dir == MODE_ADD)
        {
                key = LOCAL_COPY(arg);
@@ -1363,7 +1331,8 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
        int cur_len, mlen, paralen, paracount, arglen, len;
        int i, j, flags;
        int dir = MODE_ADD;
-       int access_dir = MODE_QUERY;
+       bool changes = false;
+       bool privileged_query = false;
        int parn = 1;
        int errors = 0;
        int alevel;
@@ -1371,12 +1340,12 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
        char c;
        struct Client *fakesource_p;
        int flags_list[3] = { ALL_MEMBERS, ONLY_CHANOPS, ONLY_OPERS };
+       int mode_limit = 0;
+       int mode_limit_simple = 0;
 
        mask_pos = 0;
        removed_mask_pos = 0;
        mode_count = 0;
-       mode_limit = 0;
-       mode_limit_simple = 0;
 
        /* Hide connecting server on netburst -- jilles */
        if (ConfigServerHide.flatten_links && IsServer(source_p) && !has_id(source_p) && !HasSentEob(source_p))
@@ -1391,13 +1360,13 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                char mode;
        };
 
-       static struct modeset modesets[MAXPARA];
+       static struct modeset modesets[MAXMODEPARAMS + MAXMODES_SIMPLE];
        struct modeset *ms = modesets, *mend;
        char canon_op = '\0';
 
        mbuf = modebuf;
 
-       for (ml = parv[0]; *ml != 0; ml++)
+       for (ml = parv[0]; *ml != 0 && ms - modesets < ARRAY_SIZE(modesets); ml++)
        {
                c = *ml;
                switch (c)
@@ -1443,6 +1412,14 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                                continue;
                        }
 
+                       if (MyClient(source_p))
+                       {
+                               if (use_arg && ++mode_limit > MAXMODEPARAMS)
+                                       continue;
+                               if (!use_arg && ++mode_limit_simple > MAXMODES_SIMPLE)
+                                       continue;
+                       }
+
                        char op = effective_dir == MODE_ADD ? '+' :
                                  effective_dir == MODE_DEL ? '-' :
                                  '=';
@@ -1452,10 +1429,10 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 
                        *mbuf++ = c;
 
-                       if (effective_dir != MODE_QUERY && access_dir == MODE_QUERY)
-                               access_dir = effective_dir;
+                       if (effective_dir != MODE_QUERY)
+                               changes = true;
                        if (effective_dir == MODE_QUERY && cm->flags & CHM_OPS_QUERY)
-                               access_dir = MODE_OP_QUERY;
+                               privileged_query = true;
 
                        ms->cm = cm;
                        ms->dir = effective_dir;
@@ -1481,6 +1458,12 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
                /* XXX we could reject excess params here */
        }
 
+       /* Finish the flood grace period if we were asked to do anything */
+       if (changes && MyClient(source_p) && !IsFloodDone(source_p))
+       {
+               flood_endgrace(source_p);
+       }
+
        mend = ms;
 
        if (parn > 1)
@@ -1492,6 +1475,9 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
        {
                *mbuf = '\0';
        }
+       int access_dir = privileged_query ? MODE_OP_QUERY :
+                        changes ? MODE_ADD :
+                        MODE_QUERY;
        alevel = get_channel_access(source_p, chptr, msptr, access_dir, modebuf);
 
        for (ms = modesets; ms < mend; ms++)