#include "s_newconf.h"
#include "logger.h"
#include "chmode.h"
-#include "irc_dictionary.h";
+#include "irc_dictionary.h"
/* bitmasks for error returns, so we send once per call */
#define SM_ERR_NOTS 0x00000001 /* No TS on channel */
/* OPTIMIZE ME! -- dwr */
void
-construct_noparam_modes(void)
+construct_cflags_strings(void)
{
int i;
char *ptr = cflagsbuf;
char *ptr2 = cflagsmyinfo;
- static int prev_chmode_flags[256];
*ptr = '\0';
*ptr2 = '\0';
!(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_owner) &&
+ !(chmode_table[i].set_func == chm_admin) &&
!(chmode_table[i].set_func == chm_op) &&
!(chmode_table[i].set_func == chm_halfop) &&
!(chmode_table[i].set_func == chm_voice))
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:
* 0 if no cflags are available
* side effects - NONE
*/
-unsigned int
+static unsigned int
find_cflag_slot(void)
{
unsigned int all_cflags = 0, my_cflag = 0, i;
return my_cflag;
}
+unsigned int
+cflag_add(char c_, ChannelModeFunc function)
+{
+ int c = (unsigned char)c_;
+
+ if (chmode_table[c].set_func != chm_nosuch &&
+ chmode_table[c].set_func != chm_orphaned)
+ return 0;
+
+ if (chmode_table[c].set_func == chm_nosuch)
+ chmode_table[c].mode_type = find_cflag_slot();
+ if (chmode_table[c].mode_type == 0)
+ return 0;
+ chmode_table[c].set_func = function;
+ construct_cflags_strings();
+ return chmode_table[c].mode_type;
+}
+
+void
+cflag_orphan(char c_)
+{
+ int c = (unsigned char)c_;
+
+ s_assert(chmode_flags[c] != 0);
+ chmode_table[c].set_func = chm_orphaned;
+ construct_cflags_strings();
+}
+
static int
get_channel_access(struct Client *source_p, struct membership *msptr)
{
- if(!MyClient(source_p) || is_owner(msptr))
- return CHFL_OWNER;
+ if(!MyClient(source_p) || is_admin(msptr))
+ return CHFL_ADMIN;
else if(is_chanop(msptr))
return CHFL_CHANOP;
else if(is_halfop(msptr))
struct Metadata *md;
struct DictionaryIter iter;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if (IsOverride(source_p))
override = 1;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
{
- /* cleanup KICKNOREJOIN metadata on -J */
+ /* cleanup metadata when the related mode is removed */
if(c == 'J')
{
DICTIONARY_FOREACH(md, &iter, chptr->metadata)
{
- if(!strcmp(md->name, "KICKNOREJOIN"))
+ if(!strcmp(md->value, "KICKNOREJOIN"))
channel_metadata_delete(chptr, md->name, 0);
}
}
+ if(c == 'K')
+ channel_metadata_delete(chptr, "NOREPEAT", 0);
chptr->mode.mode &= ~mode_type;
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
+ int override = 0;
+
if(!IsOper(source_p) && !IsServer(source_p))
{
if(!(*errors & SM_ERR_NOPRIVS))
return;
}
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
+ {
+ if (IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
+ }
+
if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
return;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
- mode_changes[mode_count].override = 0;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
mode_changes[mode_count].caps = 0;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
- mode_changes[mode_count].override = 0;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
}
case CHFL_QUIET:
list = &chptr->quietlist;
errorval = SM_ERR_RPL_Q;
- rpl_list = RPL_BANLIST;
- rpl_endlist = RPL_ENDOFBANLIST;
+ rpl_list = RPL_QUIETLIST;
+ rpl_endlist = RPL_ENDOFQUIETLIST;
mems = ALL_MEMBERS;
caps = 0;
break;
*errors |= errorval;
/* non-ops cant see +eI lists.. */
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
mode_type != CHFL_QUIET)
{
if(IsOverride(source_p))
{
- sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding modes on %s: (%s list)",
- get_oper_name(source_p), chptr->chname,
- mode_type == CHFL_INVEX ? "invex" : "exempt");
+ get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: (%s list)",
+ me.name, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
}
else
{
me.name, source_p->name, chptr->chname,
banptr->banstr, banptr->who, banptr->when);
}
- if (mode_type == CHFL_QUIET)
- sendto_one(source_p, ":%s %d %s %s :End of Channel Quiet List", me.name, rpl_endlist, source_p->name, chptr->chname);
- else
- sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
+ sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
}
void
-chm_owner(struct Client *source_p, struct Channel *chptr,
+chm_admin(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)
{
struct membership *mstptr;
- const char *ownernick;
+ const char *adminnick;
struct Client *targ_p;
int override = 0;
- if(!ConfigChannel.use_owner)
+ if(!ConfigChannel.use_admin)
{
if(*errors & SM_ERR_UNKNOWN)
return;
return;
}
- if(alevel != CHFL_OWNER)
+ if(alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
{
if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
+ sendto_one(source_p, ":%s 482 %s %s :You're not a channel administrator", me.name, source_p->name, chptr->chname);
*errors |= SM_ERR_NOOPS;
return;
}
if((dir == MODE_QUERY) || (parc <= *parn))
return;
- ownernick = parv[(*parn)];
+ adminnick = parv[(*parn)];
(*parn)++;
/* empty nick */
- if(EmptyString(ownernick))
+ if(EmptyString(adminnick))
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
return;
}
- if((targ_p = find_chasing(source_p, ownernick, NULL)) == NULL)
+ if((targ_p = find_chasing(source_p, adminnick, NULL)) == NULL)
{
return;
}
{
if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
- form_str(ERR_USERNOTINCHANNEL), ownernick, chptr->chname);
+ form_str(ERR_USERNOTINCHANNEL), adminnick, chptr->chname);
*errors |= SM_ERR_NOTONCHANNEL;
return;
}
mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags |= CHFL_OWNER;
+ mstptr->flags |= CHFL_ADMIN;
}
else
{
mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags &= ~CHFL_OWNER;
+ mstptr->flags &= ~CHFL_ADMIN;
}
}
struct Client *targ_p;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
struct Client *targ_p;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
int limit;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
int joins = 0, timeslice = 0;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
}
#ifndef FORWARD_OPERONLY
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
char *key;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
{
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
{chm_nosuch, 0 },
{chm_nosuch, 0 },
{chm_nosuch, 0 },
- {chm_owner, 0 }, /* a */
+ {chm_admin, 0 }, /* a */
{chm_ban, CHFL_BAN }, /* b */
{chm_simple, MODE_NOCOLOR }, /* c */
{chm_nosuch, 0 }, /* d */
for(i = 0; i < mode_count; i++)
{
if(mode_changes[i].letter == 0 || mode_changes[i].mems != flags)
+ continue;
if(mode_changes[i].override != override)
continue;
* bufsize (4 == +/-,modechar,two spaces) send now.
*/
if(mode_changes[i].arg != NULL &&
- ((paracount == MAXMODEPARAMSSERV) ||
- ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
+ ((paracount == MAXMODEPARAMSSERV) ||
+ ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
{
*mbuf = '\0';
if(cur_len > mlen)
{
sendto_channel_local(flags, chptr, "%s%s %s",
- cmdbuf, modebuf, parabuf);
+ cmdbuf, modebuf, parabuf);
if(override)
- sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding modes on %s: %s %s",
- get_oper_name(source_p), chptr->chname,
- modebuf, parabuf);
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
}
else
continue;
{
sendto_channel_local(flags, chptr, "%s%s %s", cmdbuf, modebuf, parabuf);
if(override)
- sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding modes on %s: %s %s",
- get_oper_name(source_p), chptr->chname,
- modebuf, parabuf);
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
}
}
if(override)
msptr->flags &= ~CHFL_CHANOP;
}
}
+
/* only propagate modes originating locally, or if we're hubbing */
if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1)
send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count);
projects / irc / rqf / shadowircd.git / blobdiff