X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-common.c;h=bc37f32a13aa945940a109cba3d627f620120c43;hb=HEAD;hp=4477fad41d5ab53d948ce2810ef8d4eb48300147;hpb=9470338742a22b299e94029bd4b1d5c043fa86e2;p=srvx.git

diff --git a/src/proto-common.c b/src/proto-common.c
index 4477fad..bc37f32 100644
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -23,6 +23,9 @@
 #include "ioset.h"
 #include "log.h"
 #include "nickserv.h"
+#include "opserv.h"
+#include "chanserv.h"
+#include "spamserv.h"
 #include "timeq.h"
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -105,7 +108,7 @@ void replay_event_loop(void)
     while (!quit_services) {
         if (!replay_connected) {
             /* this time fudging is to get some of the logging right */
-            self->link = self->boot = now;
+            self->link_time = self->boot = now;
             cManager.uplink->state = AUTHENTICATING;
             irc_introduce(cManager.uplink->password);
             replay_connected = 1;
@@ -430,6 +433,7 @@ struct privmsg_desc {
 static void
 privmsg_chan_helper(struct chanNode *cn, void *data)
 {
+    extern unsigned short offchannel_allowed[256];
     struct privmsg_desc *pd = data;
     struct modeNode *mn;
     struct chanmsg_func *cf;
@@ -443,8 +447,11 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
     /* Never send a NOTICE to a channel to one of the services */
     cf = &chanmsg_funcs[(unsigned char)pd->text[0]];
     if (cf->func && !pd->is_notice
-        && GetUserMode(cn, cf->service) && !IsDeaf(cf->service))
+        && (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++) {
@@ -476,6 +483,8 @@ part_helper(struct chanNode *cn, void *data)
 {
     struct part_desc *desc = data;
     DelChannelUser(desc->user, cn, desc->text, false);
+    if (IsOper(desc->user))
+        operpart(cn, desc->user);
 }
 
 static CMD_FUNC(cmd_part)
@@ -568,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)
 {
@@ -594,6 +631,9 @@ 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_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));
@@ -613,8 +653,14 @@ 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_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)
@@ -691,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);
@@ -711,6 +757,9 @@ 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_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));
@@ -735,6 +784,8 @@ generate_hostmask(struct userNode *user, int options)
         ident = user->ident;
     else if (options & GENMASK_ANY_IDENT)
         ident = "*";
+    else if (IsFakeIdent(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING))
+        ident = user->fakeident;
     else {
         ident = alloca(strlen(user->ident)+2);
         ident[0] = '*';
@@ -742,7 +793,12 @@ generate_hostmask(struct userNode *user, int options)
     }
     hostname = user->hostname;
     if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) {
-        hostname = user->fakehost;
+        if(user->fakehost && user->fakehost[0] == '$') {
+            hostname = alloca(strlen(user->handle_info->handle) + strlen(user->fakehost));
+            sprintf(hostname, "%s%s", user->handle_info->handle, user->fakehost+1);
+        } else {
+            hostname = user->fakehost;
+        }
     } else if (IsHiddenHost(user) && user->handle_info && hidden_host_suffix && !(options & GENMASK_NO_HIDING)) {
         hostname = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
         sprintf(hostname, "%s.%s", user->handle_info->handle, hidden_host_suffix);
@@ -758,7 +814,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);
@@ -816,3 +872,20 @@ IsChannelName(const char *name) {
     }
     return 1;
 }
+
+unsigned int
+irc_user_modes(const struct userNode *user, char modes[], size_t length)
+{
+    unsigned int ii, jj;
+
+    for (ii = jj = 0; (jj < length) && (irc_user_mode_chars[ii] != '\0'); ++ii) {
+        if ((user->modes & (1 << ii)) && (irc_user_mode_chars[ii] != ' '))
+            modes[jj++] = irc_user_mode_chars[ii];
+    }
+
+    ii = jj;
+    while (jj < length)
+        modes[jj++] = '\0';
+
+    return ii;
+}