#include "tgchange.h"
#include "inline/stringops.h"
-static int m_message(enum message_type, struct Client *, struct Client *, int, const char **);
-static int m_privmsg(struct Client *, struct Client *, int, const char **);
-static int m_notice(struct Client *, struct Client *, int, const char **);
+static int m_message(enum message_type, struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int m_privmsg(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int m_notice(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static void expire_tgchange(void *unused);
static struct ev_entry *expire_tgchange_event;
}
struct Message privmsg_msgtab = {
- "PRIVMSG", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+ "PRIVMSG", 0, 0, 0, 0,
{mg_unreg, {m_privmsg, 0}, {m_privmsg, 0}, mg_ignore, mg_ignore, {m_privmsg, 0}}
};
struct Message notice_msgtab = {
- "NOTICE", 0, 0, 0, MFLG_SLOW,
+ "NOTICE", 0, 0, 0, 0,
{mg_unreg, {m_notice, 0}, {m_notice, 0}, {m_notice, 0}, mg_ignore, {m_notice, 0}}
};
};
static int
-m_privmsg(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_privmsg(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- return m_message(MESSAGE_TYPE_PRIVMSG, client_p, source_p, parc, parv);
+ return m_message(MESSAGE_TYPE_PRIVMSG, msgbuf_p, client_p, source_p, parc, parv);
}
static int
-m_notice(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_notice(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- return m_message(MESSAGE_TYPE_NOTICE, client_p, source_p, parc, parv);
+ return m_message(MESSAGE_TYPE_NOTICE, msgbuf_p, client_p, source_p, parc, parv);
}
/*
* - pointer to channel
*/
static int
-m_message(enum message_type msgtype,
+m_message(enum message_type msgtype, struct MsgBuf *msgbuf_p,
struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
int i;
get_id(&me, source_p),
get_id(source_p, source_p),
with_prefix);
- return (-1);
+ continue;
}
if(!duplicate_ptr(chptr))
const char *text)
{
int result;
- char text2[BUFSIZE];
hook_data_privmsg_channel hdata;
if(MyClient(source_p))
source_p->localClient->last = rb_current_time();
}
- if(chptr->mode.mode & MODE_NOCOLOR)
- {
- rb_strlcpy(text2, text, BUFSIZE);
- strip_colour(text2);
- text = text2;
- if (EmptyString(text))
- {
- /* could be empty after colour stripping and
- * that would cause problems later */
- if(msgtype != MESSAGE_TYPE_NOTICE)
- sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return;
- }
- }
-
hdata.msgtype = msgtype;
hdata.source_p = source_p;
hdata.chptr = chptr;
if (hdata.approved != 0)
return;
+ /* hook may have reduced the string to nothing. */
+ if (EmptyString(text))
+ {
+ /* could be empty after colour stripping and
+ * that would cause problems later */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
+ sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
+ return;
+ }
+
/* chanops and voiced can flood their own channel with impunity */
if((result = can_send(chptr, source_p, NULL)))
{
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);
}
struct Client *client_p, struct Client *source_p,
struct Channel *chptr, const char *text)
{
- char text2[BUFSIZE];
hook_data_privmsg_channel hdata;
- if(chptr->mode.mode & MODE_NOCOLOR)
- {
- rb_strlcpy(text2, text, BUFSIZE);
- strip_colour(text2);
- text = text2;
- if (EmptyString(text))
- {
- /* could be empty after colour stripping and
- * that would cause problems later */
- if(msgtype != MESSAGE_TYPE_NOTICE)
- sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return;
- }
- }
-
hdata.msgtype = msgtype;
hdata.source_p = source_p;
hdata.chptr = chptr;
if (hdata.approved != 0)
return;
+ /* hook may have reduced the string to nothing. */
+ if (EmptyString(text))
+ {
+ /* could be empty after colour stripping and
+ * that would cause problems later */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
+ sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
+ return;
+ }
+
if(chptr->mode.mode & MODE_OPMODERATE &&
(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
IsMember(source_p, chptr)))
/*
* msg_channel_flags
*
- * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
+ * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
* say NOTICE must not auto reply
* - pointer to client_p
* - pointer to source_p
msg_channel_flags(enum message_type msgtype, struct Client *client_p,
struct Client *source_p, struct Channel *chptr, int flags, const char *text)
{
- char text2[BUFSIZE];
int type;
char c;
hook_data_privmsg_channel hdata;
source_p->localClient->last = rb_current_time();
}
- if(chptr->mode.mode & MODE_NOCOLOR)
- {
- rb_strlcpy(text2, text, BUFSIZE);
- strip_colour(text2);
- text = text2;
- if (EmptyString(text))
- {
- /* could be empty after colour stripping and
- * that would cause problems later */
- if(msgtype != MESSAGE_TYPE_NOTICE)
- sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return;
- }
- }
-
hdata.msgtype = msgtype;
hdata.source_p = source_p;
hdata.chptr = chptr;
if (hdata.approved != 0)
return;
- if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001' &&
- strncasecmp(text + 1, "ACTION ", 7))
+ if (EmptyString(text))
{
- 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();
- }
+ /* could be empty after colour stripping and
+ * that would cause problems later */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
+ sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
+ return;
}
sendto_channel_flags(client_p, type, source_p, chptr, "%s %c%s :%s",
/*
* msg_client
*
- * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
+ * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
* say NOTICE must not auto reply
* - pointer to source_p source (struct Client *)
* - pointer to target_p target (struct Client *)
* as a way to taunt users, e.g. harass them and hide behind +g
* as a way of griefing. --nenolod
*/
- if(msgtype != MESSAGE_TYPE_NOTICE && IsSetCallerId(source_p) &&
+ if(msgtype != MESSAGE_TYPE_NOTICE &&
+ (IsSetCallerId(source_p) ||
+ (IsSetRegOnlyMsg(source_p) && !target_p->user->suser[0])) &&
!accept_message(target_p, source_p) &&
!IsOper(target_p))
{
if(rb_dlink_list_length(&source_p->localClient->allow_list) <
- ConfigFileEntry.max_accept)
+ (unsigned long)ConfigFileEntry.max_accept)
{
rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
}
}
- /* reset idle time for message only if its not to self
+ /* reset idle time for message only if its not to self
* and its not a notice */
if(msgtype != MESSAGE_TYPE_NOTICE)
source_p->localClient->last = rb_current_time();
if (hdata.approved != 0)
return;
+ if (EmptyString(text))
+ {
+ /* could be empty after colour stripping and
+ * that would cause problems later */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
+ sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
+ return;
+ }
+
/* XXX Controversial? allow opers always to send through a +g */
if(!IsServer(source_p) && (IsSetCallerId(target_p) ||
(IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])))
* flood_attack_client
* inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
* say NOTICE must not auto reply
- * - pointer to source Client
+ * - pointer to source Client
* - pointer to target Client
* output - 1 if target is under flood attack
* side effects - check for flood attack on target target_p