Merge remote branch 'upstream/master'

[srvx.git] / src / proto-common.c

diff --git a/src/proto-common.c b/src/proto-common.c
index ee7a8b7c32fc8907b6783037640c2fe6f7da9991..bc37f32a13aa945940a109cba3d627f620120c43 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -577,6 +577,34 @@ call_oper_funcs(struct userNode *user)
     }
 }
 
+static xquery_func_t *xqf_list;
+static unsigned int xqf_size = 0, xqf_used = 0;
+
+void
+reg_xquery_func(xquery_func_t handler)
+{
+    if (xqf_used == xqf_size) {
+        if (xqf_size) {
+            xqf_size <<= 1;
+            xqf_list = realloc(xqf_list, xqf_size*sizeof(xquery_func_t));
+        } else {
+            xqf_size = 8;
+            xqf_list = malloc(xqf_size*sizeof(xquery_func_t));
+        }
+    }
+    xqf_list[xqf_used++] = handler;
+}
+
+static void
+call_xquery_funcs(struct server *source, const char routing[], const char query[])
+{
+    unsigned int n;
+    for (n=0; n < xqf_used; n++)
+    {
+        xqf_list[n](source, routing, query);
+    }
+}
+
 struct mod_chanmode *
 mod_chanmode_alloc(unsigned int argc)
 {
@@ -605,6 +633,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 +659,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)
@@ -706,7 +737,7 @@ mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsig
         base_oplevel = member->oplevel;
     else
         base_oplevel = MAXOPLEVEL;
-    if (!(change = mod_chanmode_parse(channel, modes, argc, flags, base_oplevel)))
+    if (!(change = mod_chanmode_parse(channel, who, modes, argc, flags, base_oplevel)))
         return 0;
     if (flags & MC_ANNOUNCE)
         mod_chanmode_announce(who, channel, change);
@@ -728,6 +759,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));