Rework ircd-side MLOCK enforcement: instead of trying to track modes locked on or...

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 8152b5f5ddb07a4281512308fe5b4f5d6e4a6c12..9cb71e8275f7b70ac2b6eefa5c4d1bde42fa6b55 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $
  */
 
 #include "stdinc.h"
@@ -67,6 +66,8 @@ static int h_can_join;
 static int h_can_create_channel;
 static int h_channel_join;
 
+struct module_modes ModuleModes;
+
 /* init_channels()
  *
  * input       -
@@ -86,6 +87,40 @@ init_channels(void)
        h_can_create_channel = register_hook("can_create_channel");
 }
 
+/* is this the best place to put this? */
+/* init_module_modes()
+ *
+ * input       -
+ * output      -
+ * side effects - various MODE_ values are set to 0
+ */
+void
+init_module_modes()
+{
+       ModuleModes.MODE_REGONLY = 0;
+       ModuleModes.MODE_NOCTCP = 0;
+       ModuleModes.MODE_NOCOLOR = 0;
+       ModuleModes.MODE_EXLIMIT = 0;
+       ModuleModes.MODE_PERMANENT = 0;
+       ModuleModes.MODE_OPMODERATE = 0;
+       ModuleModes.MODE_FREEINVITE = 0;
+       ModuleModes.MODE_FREETARGET = 0;
+       ModuleModes.MODE_DISFORWARD = 0;
+       ModuleModes.MODE_THROTTLE = 0;
+       ModuleModes.MODE_FORWARD = 0;
+       ModuleModes.MODE_NONOTICE = 0;
+       ModuleModes.MODE_NOACTION = 0;
+       ModuleModes.MODE_NOKICK = 0;
+       ModuleModes.MODE_NONICK = 0;
+       ModuleModes.MODE_NOCAPS = 0;
+       ModuleModes.MODE_NOREJOIN = 0;
+       ModuleModes.MODE_NOREPEAT = 0;
+       ModuleModes.MODE_NOOPERKICK = 0;
+
+       ModuleModes.CHFL_QUIET = 0;
+}
+
+
 /*
  * allocate_channel - Allocates a channel
  */
@@ -107,6 +142,7 @@ free_channel(struct Channel *chptr)
 {
        channel_metadata_clear(chptr);
        rb_free(chptr->chname);
+       rb_free(chptr->mode_lock);
        rb_bh_free(channel_heap, chptr);
 }
 
@@ -353,7 +389,7 @@ remove_user_from_channel(struct membership *msptr)
        if(client_p->servptr == &me)
                rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers);
 
-       if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0)
+       if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0)
                destroy_channel(chptr);
 
        rb_bh_free(member_heap, msptr);
@@ -388,7 +424,7 @@ remove_user_from_channels(struct Client *client_p)
                if(client_p->servptr == &me)
                        rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers);
 
-               if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0)
+               if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0)
                        destroy_channel(chptr);
 
                rb_bh_free(member_heap, msptr);
@@ -724,6 +760,10 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
        struct Ban *actualBan = NULL;
        struct Ban *actualExcept = NULL;
 
+       /* check to make sure quiets even exist on this server first */
+       if(ModuleModes.CHFL_QUIET == 0)
+               return 0;
+
        if(!MyClient(who))
                return 0;
 
@@ -759,7 +799,7 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
                if(match(actualBan->banstr, s) ||
                   match(actualBan->banstr, s2) ||
                   match_cidr(actualBan->banstr, s2) ||
-                  match_extban(actualBan->banstr, who, chptr, CHFL_QUIET) ||
+                  match_extban(actualBan->banstr, who, chptr, ModuleModes.CHFL_QUIET) ||
                   (s3 != NULL && match(actualBan->banstr, s3)))
                        break;
                else
@@ -826,7 +866,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char *text = rb_strdup("");
+       char text[10];
        int use_althost = 0;
        int i = 0;
        hook_data_channel moduledata;
@@ -857,6 +897,17 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN)
                return (ERR_BANNEDFROMCHAN);
 
+       rb_snprintf(text, sizeof(text), "K%s", source_p->id);
+
+       DICTIONARY_FOREACH(md, &iter, chptr->metadata)
+       {
+               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time()))
+                       return ERR_KICKNOREJOIN;
+               /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */
+               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time()))  
+                       channel_metadata_delete(chptr, md->name, 0);
+       }
+
        if(chptr->mode.mode & MODE_INVITEONLY)
        {
                RB_DLINK_FOREACH(invite, source_p->user->invited.head)
@@ -889,15 +940,19 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        if(chptr->mode.limit &&
           rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit)
                i = ERR_CHANNELISFULL;
-       if(chptr->mode.mode & MODE_REGONLY && EmptyString(source_p->user->suser))
+       if(chptr->mode.mode & ModuleModes.MODE_REGONLY && EmptyString(source_p->user->suser))
                i = ERR_NEEDREGGEDNICK;
        /* join throttling stuff --nenolod */
-       else if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0)
+       /* only check for throttles if they exist on this server --Taros */
+       else if(ModuleModes.MODE_THROTTLE)
        {
-               if ((rb_current_time() - chptr->join_delta <= 
-                       chptr->mode.join_time) && (chptr->join_count >=
-                       chptr->mode.join_num))
-                       i = ERR_THROTTLE;
+               if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0)
+               {
+                       if ((rb_current_time() - chptr->join_delta <= 
+                               chptr->mode.join_time) && (chptr->join_count >=
+                               chptr->mode.join_num))
+                               i = ERR_THROTTLE;
+               }
        }
 
        /* allow /invite to override +l/+r/+j also -- jilles */
@@ -1032,7 +1087,7 @@ find_nonickchange_channel(struct Client *client_p)
        {
                msptr = ptr->data;
                chptr = msptr->chptr;
-               if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr)))
+               if (chptr->mode.mode & ModuleModes.MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr)))
                        return chptr;
        }
        return NULL;
@@ -1287,7 +1342,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
                                           chptr->mode.join_time);
        }
 
-       if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p)))
+       if(*chptr->mode.forward && (ModuleModes.MODE_FORWARD || !IsClient(client_p)))
        {
                *mbuf++ = 'f';
 
@@ -1598,7 +1653,7 @@ check_forward(struct Client *source_p, struct Channel *chptr,
                if (hash_find_resv(chptr->chname))
                        return NULL;
                /* Don't forward to +Q channel */
-               if (chptr->mode.mode & MODE_DISFORWARD)
+               if (chptr->mode.mode & ModuleModes.MODE_DISFORWARD)
                        return NULL;
                i = can_join(source_p, chptr, key);
                if (i == 0)
@@ -1819,7 +1874,10 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
                                continue;
                        }
 
-                       flags = CHFL_CHANOP;
+                       if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin)
+                               flags = CHFL_ADMIN | CHFL_CHANOP;
+                       else
+                               flags = CHFL_CHANOP;
                }
 
                if((rb_dlink_list_length(&source_p->user->channel) >=
@@ -1858,7 +1916,7 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
                                                me.name, get_oper_name(source_p), chptr->chname);
                        }
                        else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
-                           (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
+                           (!ModuleModes.MODE_FORWARD || (chptr = check_forward(source_p, chptr, key)) == NULL))
                        {
                                /* might be wrong, but is there any other better location for such?
                                 * see extensions/chm_operonly.c for other comments on this