X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/94d53e53a43a2aa36a658c01f78abe9f3f9ddbfe..84bfb8ccb31b3ea5a083d0f51b249bba7e62a0b0:/src/chmode.c diff --git a/src/chmode.c b/src/chmode.c index 5fd0858..c736093 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -22,18 +22,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: chmode.c 3530 2007-07-14 12:20:48Z jilles $ + * $Id: chmode.c 3580 2007-11-07 23:45:14Z jilles $ */ #include "stdinc.h" -#include "tools.h" #include "channel.h" #include "client.h" #include "common.h" #include "hash.h" #include "hook.h" -#include "irc_string.h" -#include "sprintf_irc.h" +#include "match.h" #include "ircd.h" #include "numeric.h" #include "s_serv.h" /* captab */ @@ -42,10 +40,8 @@ #include "whowas.h" #include "s_conf.h" /* ConfigFileEntry, ConfigChannel */ #include "s_newconf.h" -#include "event.h" -#include "memory.h" -#include "balloc.h" -#include "s_log.h" +#include "logger.h" +#include "chmode.h" /* bitmasks for error returns, so we send once per call */ #define SM_ERR_NOTS 0x00000001 /* No TS on channel */ @@ -61,18 +57,122 @@ #define SM_ERR_RPL_Q 0x00000800 #define SM_ERR_RPL_F 0x00001000 -void set_channel_mode(struct Client *, struct Client *, - struct Channel *, struct membership *, int, const char **); - -int add_id(struct Client *source_p, struct Channel *chptr, - const char *banid, dlink_list * list, long mode_type); +#define MAXMODES_SIMPLE 46 /* a-zA-Z except bqeIov */ static struct ChModeChange mode_changes[BUFSIZE]; static int mode_count; static int mode_limit; +static int mode_limit_simple; static int mask_pos; -int +char cflagsbuf[256]; +char cflagsmyinfo[256]; + +int chmode_flags[256]; + +/* OPTIMIZE ME! -- dwr */ +void +construct_noparam_modes(void) +{ + int i; + char *ptr = cflagsbuf; + char *ptr2 = cflagsmyinfo; + static int prev_chmode_flags[256]; + + *ptr = '\0'; + *ptr2 = '\0'; + + for(i = 0; i < 256; i++) + { + if( !(chmode_table[i].set_func == chm_ban) && + !(chmode_table[i].set_func == chm_forward) && + !(chmode_table[i].set_func == chm_throttle) && + !(chmode_table[i].set_func == chm_key) && + !(chmode_table[i].set_func == chm_limit) && + !(chmode_table[i].set_func == chm_op) && + !(chmode_table[i].set_func == chm_voice)) + { + chmode_flags[i] = chmode_table[i].mode_type; + } + else + { + chmode_flags[i] = 0; + } + + if (prev_chmode_flags[i] != 0 && prev_chmode_flags[i] != chmode_flags[i]) + { + if (chmode_flags[i] == 0) + { + chmode_table[i].set_func = chm_orphaned; + sendto_realops_snomask(SNO_DEBUG, L_ALL, "Cmode +%c is now orphaned", i); + } + else + { + sendto_realops_snomask(SNO_DEBUG, L_ALL, "Orphaned cmode +%c is picked up by module", i); + } + chmode_flags[i] = prev_chmode_flags[i]; + } + else + prev_chmode_flags[i] = chmode_flags[i]; + + switch (chmode_flags[i]) + { + case MODE_EXLIMIT: + case MODE_DISFORWARD: + if(ConfigChannel.use_forward) + { + *ptr++ = (char) i; + } + + break; + case MODE_REGONLY: + if(rb_dlink_list_length(&service_list)) + { + *ptr++ = (char) i; + } + + break; + default: + if(chmode_flags[i] != 0) + { + *ptr++ = (char) i; + } + } + + /* Should we leave orphaned check here? -- dwr */ + if(!(chmode_table[i].set_func == chm_nosuch) && !(chmode_table[i].set_func == chm_orphaned)) + { + *ptr2++ = (char) i; + } + } + + *ptr++ = '\0'; + *ptr2++ = '\0'; +} + +/* + * find_umode_slot + * + * inputs - NONE + * outputs - an available cflag bitmask or + * 0 if no cflags are available + * side effects - NONE + */ +unsigned int +find_cflag_slot(void) +{ + unsigned int all_cflags = 0, my_cflag = 0, i; + + for (i = 0; i < 256; i++) + all_cflags |= chmode_flags[i]; + + for (my_cflag = 1; my_cflag && (all_cflags & my_cflag); + my_cflag <<= 1); + + return my_cflag; +} + +static int get_channel_access(struct Client *source_p, struct membership *msptr) { if(!MyClient(source_p) || is_chanop(msptr)) @@ -89,36 +189,36 @@ get_channel_access(struct Client *source_p, struct membership *msptr) */ int add_id(struct Client *source_p, struct Channel *chptr, const char *banid, - dlink_list * list, long mode_type) + rb_dlink_list * list, long mode_type) { struct Ban *actualBan; - static char who[BANLEN]; + static char who[USERHOST_REPLYLEN]; char *realban = LOCAL_COPY(banid); - dlink_node *ptr; + rb_dlink_node *ptr; /* dont let local clients overflow the banlist, or set redundant * bans */ if(MyClient(source_p)) { - if((dlink_list_length(&chptr->banlist) + dlink_list_length(&chptr->exceptlist) + dlink_list_length(&chptr->invexlist) + dlink_list_length(&chptr->quietlist)) >= (chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans)) + if((rb_dlink_list_length(&chptr->banlist) + rb_dlink_list_length(&chptr->exceptlist) + rb_dlink_list_length(&chptr->invexlist) + rb_dlink_list_length(&chptr->quietlist)) >= (chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans)) { sendto_one(source_p, form_str(ERR_BANLISTFULL), me.name, source_p->name, chptr->chname, realban); return 0; } - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { actualBan = ptr->data; - if(match(actualBan->banstr, realban)) + if(mask_match(actualBan->banstr, realban)) return 0; } } /* dont let remotes set duplicates */ else { - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { actualBan = ptr->data; if(!irccmp(actualBan->banstr, realban)) @@ -128,14 +228,14 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid, if(IsPerson(source_p)) - ircsprintf(who, "%s!%s@%s", source_p->name, source_p->username, source_p->host); + rb_sprintf(who, "%s!%s@%s", source_p->name, source_p->username, source_p->host); else - strlcpy(who, source_p->name, sizeof(who)); + rb_strlcpy(who, source_p->name, sizeof(who)); actualBan = allocate_ban(realban, who); - actualBan->when = CurrentTime; + actualBan->when = rb_current_time(); - dlinkAdd(actualBan, &actualBan->node, list); + rb_dlinkAdd(actualBan, &actualBan->node, list); /* invalidate the can_send() cache */ if(mode_type == CHFL_BAN || mode_type == CHFL_QUIET || mode_type == CHFL_EXCEPTION) @@ -151,21 +251,21 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid, * side effects - given id is removed from the appropriate list */ int -del_id(struct Channel *chptr, const char *banid, dlink_list * list, long mode_type) +del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list, long mode_type) { - dlink_node *ptr; + rb_dlink_node *ptr; struct Ban *banptr; if(EmptyString(banid)) return 0; - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { banptr = ptr->data; if(irccmp(banid, banptr->banstr) == 0) { - dlinkDelete(&banptr->node, list); + rb_dlinkDelete(&banptr->node, list); free_ban(banptr); /* invalidate the can_send() cache */ @@ -239,7 +339,7 @@ pretty_mask(const char *idmask) if (*mask == '$') { - mask_pos += ircsprintf(mask_buf + mask_pos, "%s", mask) + 1; + mask_pos += rb_sprintf(mask_buf + mask_pos, "%s", mask) + 1; t = mask_buf + old_mask_pos + 1; if (*t == '!') *t = '~'; @@ -309,7 +409,7 @@ pretty_mask(const char *idmask) host[HOSTLEN] = '\0'; } - mask_pos += ircsprintf(mask_buf + mask_pos, "%s!%s@%s", nick, user, host) + 1; + mask_pos += rb_sprintf(mask_buf + mask_pos, "%s!%s@%s", nick, user, host) + 1; /* restore mask, since we may need to use it again later */ if(at) @@ -401,8 +501,8 @@ chm_simple(struct Client *source_p, struct Channel *chptr, return; } - /* +ntspmaikl == 9 + MAXMODEPARAMS (4 * +o) */ - if(MyClient(source_p) && (++mode_limit > (9 + MAXMODEPARAMS))) + /* flags (possibly upto 32) + 4 with param */ + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) return; /* setting + */ @@ -437,6 +537,40 @@ chm_simple(struct Client *source_p, struct Channel *chptr, } } +void +chm_orphaned(struct Client *source_p, struct Channel *chptr, + int alevel, int parc, int *parn, + const char **parv, int *errors, int dir, char c, long mode_type) +{ + if(MyClient(source_p)) + return; + + if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type)) + { + chptr->mode.mode |= mode_type; + + mode_changes[mode_count].letter = c; + mode_changes[mode_count].dir = MODE_ADD; + mode_changes[mode_count].caps = 0; + mode_changes[mode_count].nocaps = 0; + mode_changes[mode_count].id = NULL; + mode_changes[mode_count].mems = ALL_MEMBERS; + mode_changes[mode_count++].arg = NULL; + } + else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type)) + { + chptr->mode.mode &= ~mode_type; + + mode_changes[mode_count].letter = c; + mode_changes[mode_count].dir = MODE_DEL; + mode_changes[mode_count].caps = 0; + mode_changes[mode_count].nocaps = 0; + mode_changes[mode_count].mems = ALL_MEMBERS; + mode_changes[mode_count].id = NULL; + mode_changes[mode_count++].arg = NULL; + } +} + void chm_staff(struct Client *source_p, struct Channel *chptr, int alevel, int parc, int *parn, @@ -449,6 +583,17 @@ chm_staff(struct Client *source_p, struct Channel *chptr, *errors |= SM_ERR_NOPRIVS; return; } + if(MyClient(source_p) && !IsOperResv(source_p)) + { + if(!(*errors & SM_ERR_NOPRIVS)) + sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, + source_p->name, "resv"); + *errors |= SM_ERR_NOPRIVS; + return; + } + + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) + return; /* setting + */ if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type)) @@ -484,8 +629,8 @@ chm_ban(struct Client *source_p, struct Channel *chptr, { const char *mask; const char *raw_mask; - dlink_list *list; - dlink_node *ptr; + rb_dlink_list *list; + rb_dlink_node *ptr; struct Ban *banptr; int errorval; int rpl_list; @@ -572,7 +717,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr, return; } - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { banptr = ptr->data; sendto_one(source_p, form_str(rpl_list), @@ -615,8 +760,11 @@ chm_ban(struct Client *source_p, struct Channel *chptr, else mask = pretty_mask(raw_mask); - /* we'd have problems parsing this, hyb6 does it too */ - if(strlen(mask) > (MODEBUFLEN - 2)) + /* we'd have problems parsing this, hyb6 does it too + * also make sure it will always fit on a line with channel + * name etc. + */ + if(strlen(mask) > IRCD_MIN(BANLEN, MODEBUFLEN - 5)) return; /* if we're adding a NEW id */ @@ -727,7 +875,6 @@ chm_op(struct Client *source_p, struct Channel *chptr, mode_changes[mode_count++].client = targ_p; mstptr->flags |= CHFL_CHANOP; - mstptr->flags &= ~CHFL_DEOPPED; } else { @@ -850,6 +997,9 @@ chm_limit(struct Client *source_p, struct Channel *chptr, if(dir == MODE_QUERY) return; + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) + return; + if((dir == MODE_ADD) && parc > *parn) { lstr = parv[(*parn)]; @@ -858,7 +1008,7 @@ chm_limit(struct Client *source_p, struct Channel *chptr, if(EmptyString(lstr) || (limit = atoi(lstr)) <= 0) return; - ircsprintf(limitstr, "%d", limit); + rb_sprintf(limitstr, "%d", limit); mode_changes[mode_count].letter = c; mode_changes[mode_count].dir = MODE_ADD; @@ -906,6 +1056,9 @@ chm_throttle(struct Client *source_p, struct Channel *chptr, if(dir == MODE_QUERY) return; + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) + return; + if((dir == MODE_ADD) && parc > *parn) { sscanf(parv[(*parn)], "%d:%d", &joins, ×lice); @@ -992,6 +1145,9 @@ chm_forward(struct Client *source_p, struct Channel *chptr, } #endif + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) + return; + if(dir == MODE_ADD && parc > *parn) { forward = parv[(*parn)]; @@ -1029,7 +1185,7 @@ chm_forward(struct Client *source_p, struct Channel *chptr, } } - strlcpy(chptr->mode.forward, forward, sizeof(chptr->mode.forward)); + rb_strlcpy(chptr->mode.forward, forward, sizeof(chptr->mode.forward)); mode_changes[mode_count].letter = c; mode_changes[mode_count].dir = MODE_ADD; @@ -1075,6 +1231,9 @@ chm_key(struct Client *source_p, struct Channel *chptr, if(dir == MODE_QUERY) return; + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) + return; + if((dir == MODE_ADD) && parc > *parn) { key = LOCAL_COPY(parv[(*parn)]); @@ -1089,7 +1248,7 @@ chm_key(struct Client *source_p, struct Channel *chptr, return; s_assert(key[0] != ' '); - strlcpy(chptr->mode.key, key, sizeof(chptr->mode.key)); + rb_strlcpy(chptr->mode.key, key, sizeof(chptr->mode.key)); mode_changes[mode_count].letter = c; mode_changes[mode_count].dir = MODE_ADD; @@ -1149,14 +1308,17 @@ chm_regonly(struct Client *source_p, struct Channel *chptr, if(dir == MODE_QUERY) return; - if(((dir == MODE_ADD) && (chptr->mode.mode & MODE_REGONLY)) || - ((dir == MODE_DEL) && !(chptr->mode.mode & MODE_REGONLY))) + if(((dir == MODE_ADD) && (chptr->mode.mode & mode_type)) || + ((dir == MODE_DEL) && !(chptr->mode.mode & mode_type))) + return; + + if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE)) return; if(dir == MODE_ADD) - chptr->mode.mode |= MODE_REGONLY; + chptr->mode.mode |= mode_type; else - chptr->mode.mode &= ~MODE_REGONLY; + chptr->mode.mode &= ~mode_type; mode_changes[mode_count].letter = c; mode_changes[mode_count].dir = dir; @@ -1285,7 +1447,7 @@ struct ChannelMode chmode_table[256] = {chm_op, 0 }, /* o */ {chm_simple, MODE_PRIVATE }, /* p */ {chm_ban, CHFL_QUIET }, /* q */ - {chm_regonly, 0 }, /* r */ + {chm_regonly, MODE_REGONLY }, /* r */ {chm_simple, MODE_SECRET }, /* s */ {chm_simple, MODE_TOPICLIMIT }, /* t */ {chm_nosuch, 0 }, /* u */ @@ -1469,6 +1631,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, mask_pos = 0; mode_count = 0; mode_limit = 0; + mode_limit_simple = 0; alevel = get_channel_access(source_p, msptr); @@ -1505,9 +1668,9 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, return; if(IsServer(source_p)) - mlen = ircsprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname); + mlen = rb_sprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname); else - mlen = ircsprintf(modebuf, ":%s!%s@%s MODE %s ", + mlen = rb_sprintf(modebuf, ":%s!%s@%s MODE %s ", source_p->name, source_p->username, source_p->host, chptr->chname); @@ -1571,7 +1734,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, if(mode_changes[i].arg != NULL) { paracount++; - len = ircsprintf(pbuf, "%s ", mode_changes[i].arg); + len = rb_sprintf(pbuf, "%s ", mode_changes[i].arg); pbuf += len; paralen += len; } @@ -1586,6 +1749,6 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, } /* only propagate modes originating locally, or if we're hubbing */ - if(MyClient(source_p) || dlink_list_length(&serv_list) > 1) + if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1) send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count); }