X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/832942858cbc9d9f3d34caa7ea3be26d89360ee6..aa65834c6fd6302e5ef3e810abc107ea737bcc74:/src/chmode.c diff --git a/src/chmode.c b/src/chmode.c index 3f42a6f..6c3fc36 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -26,14 +26,12 @@ */ #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,12 @@ #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); - static struct ChModeChange mode_changes[BUFSIZE]; static int mode_count; static int mode_limit; static int mask_pos; -int +static int get_channel_access(struct Client *source_p, struct membership *msptr) { if(!MyClient(source_p) || is_chanop(msptr)) @@ -89,26 +79,26 @@ 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[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(mask_match(actualBan->banstr, realban)) @@ -118,7 +108,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid, /* 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 +118,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 +141,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 +229,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 +299,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) @@ -449,6 +439,14 @@ 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; + } /* setting + */ if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type)) @@ -484,8 +482,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 +570,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), @@ -730,7 +728,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 { @@ -861,7 +858,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; @@ -1032,7 +1029,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; @@ -1092,7 +1089,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; @@ -1508,9 +1505,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); @@ -1574,7 +1571,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; } @@ -1589,6 +1586,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); }