add client_can_send_controlcode_or_ctcp_to_channel() function in channel.c
and use that (2x ircd_relay.c, m_wallchops.c, m_wallvoices.c), instead of duplicating code 4 times
+function uses a table to check for control codes, which is faster than what was used before
also corrects that an error is returned in WALLVOICES and WALLCHOPS in case +c or +C blocks the message, which is also done for other modes there
-function loops over the text one time to check for control codes or CTCP chars, instead of twice as the old code did
+also corrects that CTCP ACTION is only allowed for PRIVMSG, and not for NOTICE WALLCHOPS and WALLVOICES
-diff -r e80591f05c47 include/channel.h
---- a/include/channel.h Sat Mar 20 17:57:13 2010 +0100
-+++ b/include/channel.h Sat Mar 20 18:16:22 2010 +0100
+diff -r 8567e020893c include/channel.h
+--- a/include/channel.h Thu Mar 25 13:10:37 2010 +0100
++++ b/include/channel.h Thu Mar 25 13:25:55 2010 +0100
@@ -398,6 +398,7 @@
extern struct Membership* find_channel_member(struct Client* cptr, struct Channel* chptr);
extern int member_can_send_to_channel(struct Membership* member, int reveal);
extern void remove_user_from_channel(struct Client *sptr, struct Channel *chptr);
extern void remove_user_from_all_channels(struct Client* cptr);
-diff -r e80591f05c47 ircd/channel.c
---- a/ircd/channel.c Sat Mar 20 17:57:13 2010 +0100
-+++ b/ircd/channel.c Sat Mar 20 18:16:22 2010 +0100
-@@ -778,6 +778,48 @@
+diff -r 8567e020893c ircd/channel.c
+--- a/ircd/channel.c Thu Mar 25 13:10:37 2010 +0100
++++ b/ircd/channel.c Thu Mar 25 13:25:55 2010 +0100
+@@ -778,6 +778,68 @@
return member_can_send_to_channel(member, reveal);
}
++/** Table with control chars that should be blocked by chanmode +c
++ *
++ * codes: bold 2, colour 3, reverse 22, ansi escape 27, underline 31
++ *
++ */
++static int control_codes[256] = {
++ 0, 0, 1, 1, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 1, 0,
++ 0, 0, 0, 1, 0, 0, 0, 1,
++};
++
+/** Check if a client can send control codes or CTCP to a channel
+ *
+ * @param cptr The client to check
+int client_can_send_controlcode_or_ctcp_to_channel(struct Client *cptr, struct Channel *chptr, const char *text, int action)
+{
+ int control = 0, ctcp = 0;
-+ const char *chr;
++ const unsigned char *chr;
++
++ assert(0 != cptr);
++ assert(0 != chptr);
+
+ /* dont check this for remote users or servers - fail safe */
+ if (!MyUser(cptr) || IsServer(cptr))
+ if (chptr->mode.mode & MODE_NOCOLOUR)
+ control = 1;
+
-+ /* mode +C set - do allow CTCP ACTION though but only when action is 1 */
-+ if ((chptr->mode.mode & MODE_NOCTCP) && (!action || ircd_strncmp(text,"\001ACTION ",8)))
++ /* mode +C set */
++ if (chptr->mode.mode & MODE_NOCTCP) {
+ ctcp = 1;
+
++ /* when action is 1, do allow CTCP ACTION though */
++ if (action && !ircd_strncmp(text,"\001ACTION ",8))
++ ctcp = 0;
++ }
++
+ /* nothing to check */
+ if (!control && !ctcp)
+ return 1;
+
+ /* search for control codes and/or CTCP chars */
+ for (chr=text;*chr;chr++) {
-+ if ((ctcp && *chr==1) || (control && (*chr==2 || *chr==3 || *chr==22 || *chr==27 || *chr==31)))
++ if ((ctcp && *chr==1) || (control && control_codes[*chr]))
+ return 0;
+ }
+
/** Returns the name of a channel that prevents the user from changing nick.
* if a member and not (opped or voiced) and (banned or moderated), return
* the name of the first channel banned on.
-diff -r e80591f05c47 ircd/ircd_relay.c
---- a/ircd/ircd_relay.c Sat Mar 20 17:57:13 2010 +0100
-+++ b/ircd/ircd_relay.c Sat Mar 20 18:16:22 2010 +0100
+diff -r 8567e020893c ircd/ircd_relay.c
+--- a/ircd/ircd_relay.c Thu Mar 25 13:10:37 2010 +0100
++++ b/ircd/ircd_relay.c Thu Mar 25 13:25:55 2010 +0100
@@ -87,7 +87,6 @@
void relay_channel_message(struct Client* sptr, const char* name, const char* text, const int targetc)
{
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r e80591f05c47 ircd/m_wallchops.c
---- a/ircd/m_wallchops.c Sat Mar 20 17:57:13 2010 +0100
-+++ b/ircd/m_wallchops.c Sat Mar 20 18:16:22 2010 +0100
+diff -r 8567e020893c ircd/m_wallchops.c
+--- a/ircd/m_wallchops.c Thu Mar 25 13:10:37 2010 +0100
++++ b/ircd/m_wallchops.c Thu Mar 25 13:25:55 2010 +0100
@@ -103,7 +103,6 @@
{
struct Channel *chptr;
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r e80591f05c47 ircd/m_wallvoices.c
---- a/ircd/m_wallvoices.c Sat Mar 20 17:57:13 2010 +0100
-+++ b/ircd/m_wallvoices.c Sat Mar 20 18:16:22 2010 +0100
+diff -r 8567e020893c ircd/m_wallvoices.c
+--- a/ircd/m_wallvoices.c Thu Mar 25 13:10:37 2010 +0100
++++ b/ircd/m_wallvoices.c Thu Mar 25 13:25:55 2010 +0100
@@ -102,7 +102,6 @@
{
struct Channel *chptr;