vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove MODE_NOCTCP from core, in favor of chm_noctcp.

Browse source
This commit is contained in:
William Pitcock 2012-03-31 22:48:36 -05:00
parent 67aeaba593
commit f30a5ee4c4
5 changed files with 81 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/core/m_message.c
View file

@ -527,18 +527,6 @@ msg_channel(enum message_type msgtype,
if(result == CAN_SEND_OPV ||
!flood_attack_channel(msgtype, source_p, chptr, chptr->chname))
{
if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001' &&
strncasecmp(text + 1, "ACTION ", 7))
{
if (chptr->mode.mode & MODE_NOCTCP)
{
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return;
}
else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))
source_p->large_ctcp_sent = rb_current_time();
}
sendto_channel_flags(client_p, ALL_MEMBERS, source_p, chptr,
"%s %s :%s", cmdname[msgtype], chptr->chname, text);
}
@ -692,25 +680,6 @@ msg_channel_flags(enum message_type msgtype, struct Client *client_p,
return;
}
if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001' &&
strncasecmp(text + 1, "ACTION ", 7))
{
if (chptr->mode.mode & MODE_NOCTCP)
{
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return;
}
else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))
{
/* This overestimates the number of users the CTCP
* is being sent to, so large_ctcp_sent might be
* set inappropriately. This should not be a problem.
*/
source_p->large_ctcp_sent = rb_current_time();
}
}
sendto_channel_flags(client_p, type, source_p, chptr, "%s %c%s :%s",
cmdname[msgtype], c, chptr->chname, text);
}