added CMODE_AUDITORIUM & CMODE_NOFLOOD

diff --git a/src/hash.h b/src/hash.h
index 364b5f5736b685cc04bd683489cd5355c74d72cd..e622975dba9d4a1a27d7c96a9737ea479179fc16 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -47,6 +47,8 @@
 #define MODE_NOAMSGS        0x80000 /* +M */
 #define MODE_ALTCHAN        0x100000 /* +F */
 #define MODE_ACCESS         0x200000 /* +a */
+#define MODE_NOFLOOD        0x400000 /* +f */
+#define MODE_AUDITORIUM     0x800000 /* +u */
 #define MODE_REMOVE         0x80000000
 
 #define FLAGS_OPER          0x0001 /* +o global operator */
@@ -98,6 +100,7 @@
 #define IsFakeIdent(x)          ((x)->fakeident[0] != '\0')
 #define IsLocal(x)              ((x)->uplink == self)
 
+#define NOFLOODLEN      15
 #define NICKLEN         30
 #define USERLEN         10
 #define HOSTLEN         63
@@ -151,6 +154,7 @@ struct chanNode {
     unsigned int locks;
     char key[KEYLEN + 1];
     char altchan[CHANNELLEN + 1];
+    char noflood[NOFLOODLEN + 1];
     char upass[KEYLEN + 1];
     char apass[KEYLEN + 1];
     unsigned long timestamp; /* creation time */

diff --git a/src/opserv.c b/src/opserv.c
index e6efce3c0e50031c4526797485c04779fbc5fcd4..2776e5a05e2d185058dbb0651f6a30f77ca1e9d9 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -1239,7 +1239,7 @@ static MODCMD_FUNC(cmd_part)
 
 static MODCMD_FUNC(cmd_mode)
 {
-    if (!modcmd_chanmode(argv+1, argc-1, MCP_ALLOW_OVB|MCP_KEY_FREE|MC_ANNOUNCE)) {
+    if (!modcmd_chanmode(argv+1, argc-1, MCP_ALLOW_OVB|MCP_KEY_FREE|MC_ANNOUNCE|MCP_OPERMODE)) {
         reply("MSG_INVALID_MODES", unsplit_string(argv+1, argc-1, NULL));
         return 0;
     }

diff --git a/src/proto-common.c b/src/proto-common.c
index ee7a8b7c32fc8907b6783037640c2fe6f7da9991..3b424d45d715b41301c095a9bf1e9d3ed944ce46 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -605,6 +605,7 @@ mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra)
         res->new_limit = orig->new_limit;
         res->new_access = orig->new_access;
         memcpy(res->new_altchan, orig->new_altchan, sizeof(res->new_altchan));
+        memcpy(res->new_noflood, orig->new_noflood, sizeof(res->new_noflood));
         memcpy(res->new_key, orig->new_key, sizeof(res->new_key));
         memcpy(res->new_upass, orig->new_upass, sizeof(res->new_upass));
         memcpy(res->new_apass, orig->new_apass, sizeof(res->new_apass));
@@ -630,6 +631,8 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch
         strcpy(channel->key, change->new_key);
     if (change->modes_set & MODE_ALTCHAN)
         strcpy(channel->altchan, change->new_altchan);
+    if (change->modes_set & MODE_NOFLOOD)
+        strcpy(channel->noflood, change->new_noflood);
     if (change->modes_set & MODE_UPASS)
        strcpy(channel->upass, change->new_upass);
     if (change->modes_set & MODE_APASS)
@@ -728,6 +731,7 @@ irc_make_chanmode(struct chanNode *chan, char *out)
     change.new_limit = chan->limit;
     change.new_access = chan->access;
     safestrncpy(change.new_altchan, chan->altchan, sizeof(change.new_altchan));
+    safestrncpy(change.new_noflood, chan->noflood, sizeof(change.new_noflood));
     safestrncpy(change.new_key, chan->key, sizeof(change.new_key));
     safestrncpy(change.new_upass, chan->upass, sizeof(change.new_upass));
     safestrncpy(change.new_apass, chan->apass, sizeof(change.new_apass));

diff --git a/src/proto-p10.c b/src/proto-p10.c
index e04d65650ceb16da3ad4c4c5db5bf1db4833ac27..f89586b9d24103572196aad73c6b847baf9a108a 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -2627,6 +2627,38 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
                 }
             }
             break;
+        case 'f':
+                   if (add) {
+                           if (in_arg >= argc)
+                    goto error;
+                mode = modes[in_arg++];
+                if(mode[0] == '!' && !(flags & MCP_OPERMODE)) { //noflood flag also for overriders
+                    //only allow opers
+                    goto error;
+                }
+                if(mode[0] == '+' || mode[0] == '@') {
+                    mode++;
+                }
+                char *p;
+                int count = 0, time = 0;
+                for(p = mode; p[0]; p++) {
+                    if(p[0] == ':') {
+                        char tmpchar = p[0];
+                        p[0] = '\0';
+                        count = strtoul(mode,0,10);
+                        p[0] = tmpchar;
+                                               p++;
+                                               time = strtoul(p,0,10);
+                                               break;
+                               }
+                }
+                if(count <= 0 || time <= 0 || count > 100 || time > 600) 
+                                   goto error;
+                               change->modes_set |= MODE_NOFLOOD;
+                               safestrncpy(change->new_noflood, modes[in_arg - 1], sizeof(change->new_noflood));
+                       } else {
+                           change->modes_clear |= MODE_NOFLOOD;
+                       }
         case 'F':
             if (add) {
                 if (in_arg >= argc)
@@ -2819,6 +2851,7 @@ mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod
         DO_MODE_CHAR(LIMIT, 'l');
         DO_MODE_CHAR(ACCESS, 'a');
         DO_MODE_CHAR(ALTCHAN, 'F');
+        DO_MODE_CHAR(NOFLOOD, 'f');
         DO_MODE_CHAR(DELAYJOINS, 'D');
         DO_MODE_CHAR(REGONLY, 'r');
         DO_MODE_CHAR(NOCOLORS, 'c');
@@ -2888,6 +2921,8 @@ mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod
         }
         if (change->modes_set & MODE_ALTCHAN)
             mod_chanmode_append(&chbuf, 'F', change->new_altchan);
+        if (change->modes_set & MODE_NOFLOOD)
+            mod_chanmode_append(&chbuf, 'f', change->new_noflood);
     }
     for (arg = 0; arg < change->argc; ++arg) {
         if (change->args[arg].mode & MODE_REMOVE)
@@ -2936,6 +2971,7 @@ mod_chanmode_format(struct mod_chanmode *change, char *outbuff)
         DO_MODE_CHAR(LIMIT, 'l');
         DO_MODE_CHAR(ACCESS, 'a');
         DO_MODE_CHAR(ALTCHAN, 'F');
+        DO_MODE_CHAR(NOFLOOD, 'f');
         DO_MODE_CHAR(KEY, 'k');
         DO_MODE_CHAR(UPASS, 'U');
         DO_MODE_CHAR(APASS, 'A');
@@ -2968,6 +3004,7 @@ mod_chanmode_format(struct mod_chanmode *change, char *outbuff)
         DO_MODE_CHAR(KEY, 'k'), args_used += sprintf(args + args_used, " %s", change->new_key);
         DO_MODE_CHAR(KEY, 'a'), args_used += sprintf(args + args_used, " %d", change->new_access);
         DO_MODE_CHAR(KEY, 'F'), args_used += sprintf(args + args_used, " %s", change->new_altchan);
+        DO_MODE_CHAR(KEY, 'f'), args_used += sprintf(args + args_used, " %s", change->new_noflood);
         DO_MODE_CHAR(UPASS, 'U'), args_used += sprintf(args + args_used, " %s", change->new_upass);
         DO_MODE_CHAR(APASS, 'A'), args_used += sprintf(args + args_used, " %s", change->new_apass);
 #undef DO_MODE_CHAR
@@ -2996,6 +3033,10 @@ clear_chanmode(struct chanNode *channel, const char *modes)
             cleared |= MODE_ALTCHAN;
             channel->altchan[0] = '\0';
             break;
+        case 'f':
+            cleared |= MODE_NOFLOOD;
+            channel->noflood[0] = '\0';
+            break;
         case 'k':
             cleared |= MODE_KEY;
             channel->key[0] = '\0';

diff --git a/src/proto.h b/src/proto.h
index a2e03a1ffe5132ee26eabf2fc4868fa07c1651ec..aa83e83a98490f84673411d71f38411da15d8bb8 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -188,6 +188,7 @@ unsigned int irc_user_modes(const struct userNode *user, char modes[], size_t le
 
 /* Channel mode manipulation */
 #define KEYLEN          23
+#define NOFLOODLEN      15
 #define CHANNELLEN      200
 typedef unsigned long chan_mode_t;
 /* Rules for struct mod_chanmode:
@@ -203,6 +204,7 @@ struct mod_chanmode {
 #endif
     char new_key[KEYLEN + 1];
     char new_altchan[CHANNELLEN + 1];
+    char new_noflood[NOFLOODLEN + 1];
     char new_upass[KEYLEN + 1];
     char new_apass[KEYLEN + 1];
     struct {
@@ -223,6 +225,7 @@ struct mod_chanmode {
 #define MCP_IGN_REGISTERED 0x0080 /* chan is already registered; ignore changes to MODE_REGISTERED */
 #define MC_ANNOUNCE        0x0100 /* send a mod_chanmode() change out */
 #define MC_NOTIFY          0x0200 /* make local callbacks to announce */
+#define MCP_OPERMODE       0x0400
 #ifdef NDEBUG
 #define mod_chanmode_init(CHANMODE) do { memset((CHANMODE), 0, sizeof(*CHANMODE)); } while (0)
 #else