general support for Channel Mode +NMFa and User Mode +SDXHst

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

diff --git a/src/proto-common.c b/src/proto-common.c
index c04fd712962e28e21faff9570f2e5418b51c4a44..e71bacd6959323c24896f048f382338c66d6f8a0 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -23,6 +23,7 @@
 #include "ioset.h"
 #include "log.h"
 #include "nickserv.h"
+#include "spamserv.h"
 #include "timeq.h"
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -447,6 +448,8 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
         && (offchannel_allowed[(unsigned char)pd->text[0]]
             || (GetUserMode(cn, cf->service) && !IsDeaf(cf->service))))
         cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice);
+    else
+        spamserv_channel_message(cn, pd->user, pd->text);
 
     /* This catches *all* text sent to the channel that the services server sees */
     for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) {
@@ -596,6 +599,8 @@ mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra)
         res->modes_set = orig->modes_set;
         res->modes_clear = orig->modes_clear;
         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_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));
@@ -615,8 +620,12 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch
     channel->modes = (channel->modes & ~change->modes_clear) | change->modes_set;
     if (change->modes_set & MODE_LIMIT)
         channel->limit = change->new_limit;
+    if (change->modes_set & MODE_ACCESS)
+        channel->access = change->new_access;
     if (change->modes_set & MODE_KEY)
         strcpy(channel->key, change->new_key);
+    if (change->modes_set & MODE_ALTCHAN)
+        strcpy(channel->altchan, change->new_altchan);
     if (change->modes_set & MODE_UPASS)
        strcpy(channel->upass, change->new_upass);
     if (change->modes_set & MODE_APASS)
@@ -713,6 +722,8 @@ irc_make_chanmode(struct chanNode *chan, char *out)
     mod_chanmode_init(&change);
     change.modes_set = chan->modes;
     change.new_limit = chan->limit;
+    change.new_access = chan->access;
+    safestrncpy(change.new_altchan, chan->altchan, sizeof(change.new_altchan));
     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));
@@ -762,7 +773,7 @@ generate_hostmask(struct userNode *user, int options)
             sprintf(hostname, "%d.%d.*", user->ip.in6_8[12], user->ip.in6_8[13]);
         } else if (irc_in_addr_is_ipv6(user->ip)) {
             /* Who knows what the default mask should be?  Use a /48 to start with. */
-            sprintf(hostname, "%x:%x:%x:*", user->ip.in6[0], user->ip.in6[1], user->ip.in6[2]);
+            sprintf(hostname, "%x:%x:%x:*", ntohs(user->ip.in6[0]), ntohs(user->ip.in6[1]), ntohs(user->ip.in6[2]));
         } else {
             /* Unknown type; just copy IP directly. */
             irc_ntop(hostname, IRC_NTOP_MAX_SIZE, &user->ip);