* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_message.c 3173 2007-01-31 23:57:18Z jilles $
*/
#include "stdinc.h"
#include "client.h"
#include "ircd.h"
#include "numeric.h"
-#include "common.h"
#include "s_conf.h"
#include "s_serv.h"
#include "msg.h"
#include "tgchange.h"
#include "inline/stringops.h"
-static int m_message(int, const char *, 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 const char message_desc[] =
+ "Provides the PRIVMSG and NOTICE commands to send messages to users and channels";
+
+static void m_message(enum message_type, struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_privmsg(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_notice(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_echo(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static void echo_msg(struct Client *, struct Client *, enum message_type, const char *);
static void expire_tgchange(void *unused);
static struct ev_entry *expire_tgchange_event;
+static unsigned int CAP_ECHO;
+
static int
modinit(void)
{
}
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}}
};
+struct Message echo_msgtab = {
+ "ECHO", 0, 0, 0, 0,
+ {mg_unreg, mg_ignore, {m_echo, 3}, mg_ignore, mg_ignore, mg_ignore}
+};
-mapi_clist_av1 message_clist[] = { &privmsg_msgtab, ¬ice_msgtab, NULL };
+mapi_clist_av1 message_clist[] = { &privmsg_msgtab, ¬ice_msgtab, &echo_msgtab, NULL };
-DECLARE_MODULE_AV1(message, modinit, moddeinit, message_clist, NULL, NULL, "$Revision: 3173 $");
+mapi_cap_list_av2 message_cap_list[] = {
+ { MAPI_CAP_SERVER, "ECHO", NULL, &CAP_ECHO },
+ { 0, NULL, NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(message, modinit, moddeinit, message_clist, NULL, NULL, message_cap_list, NULL, message_desc);
struct entity
{
int flags;
};
-static int build_target_list(int p_or_n, const char *command,
+static int build_target_list(enum message_type msgtype,
struct Client *client_p,
struct Client *source_p, const char *nicks_channels, const char *text);
-static int flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p);
-static int flood_attack_channel(int p_or_n, struct Client *source_p,
- struct Channel *chptr, char *chname);
+static bool flood_attack_client(enum message_type msgtype, struct Client *source_p, struct Client *target_p);
/* Fifteen seconds should be plenty for a client to reply a ctcp */
#define LARGE_CTCP_TIME 15
static struct entity targets[512];
static int ntargets = 0;
-static int duplicate_ptr(void *);
+static bool duplicate_ptr(void *);
-static void msg_channel(int p_or_n, const char *command,
+static void msg_channel(enum message_type msgtype,
struct Client *client_p,
struct Client *source_p, struct Channel *chptr, const char *text);
-static void msg_channel_opmod(int p_or_n, const char *command,
+static void msg_channel_opmod(enum message_type msgtype,
struct Client *client_p,
struct Client *source_p, struct Channel *chptr,
const char *text);
-static void msg_channel_flags(int p_or_n, const char *command,
+static void msg_channel_flags(enum message_type msgtype,
struct Client *client_p,
struct Client *source_p,
struct Channel *chptr, int flags, const char *text);
-static void msg_client(int p_or_n, const char *command,
+static void msg_client(enum message_type msgtype,
struct Client *source_p, struct Client *target_p, const char *text);
-static void handle_special(int p_or_n, const char *command,
+static void handle_special(enum message_type msgtype,
struct Client *client_p, struct Client *source_p, const char *nick,
const char *text);
** -db Nov 13, 2000
**
*/
+const char *cmdname[MESSAGE_TYPE_COUNT] = {
+ [MESSAGE_TYPE_PRIVMSG] = "PRIVMSG",
+ [MESSAGE_TYPE_NOTICE] = "NOTICE",
+};
-#define PRIVMSG 0
-#define NOTICE 1
-
-static int
-m_privmsg(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_privmsg(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- return m_message(PRIVMSG, "PRIVMSG", client_p, source_p, parc, parv);
+ 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[])
+static void
+m_notice(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- return m_message(NOTICE, "NOTICE", client_p, source_p, parc, parv);
+ m_message(MESSAGE_TYPE_NOTICE, msgbuf_p, client_p, source_p, parc, parv);
}
/*
* inputs - flag privmsg or notice
- * - pointer to command "PRIVMSG" or "NOTICE"
* - pointer to client_p
* - pointer to source_p
* - pointer to channel
*/
-static int
-m_message(int p_or_n,
- const char *command,
+static void
+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;
if(parc < 2 || EmptyString(parv[1]))
{
- if(p_or_n != NOTICE)
+ if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one(source_p, form_str(ERR_NORECIPIENT), me.name,
- source_p->name, command);
- return 0;
+ source_p->name, cmdname[msgtype]);
+ return;
}
if(parc < 3 || EmptyString(parv[2]))
{
- if(p_or_n != NOTICE)
+ if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return 0;
+ return;
}
/* Finish the flood grace period if theyre not messaging themselves
if(MyClient(source_p) && !IsFloodDone(source_p) && irccmp(source_p->name, parv[1]))
flood_endgrace(source_p);
- if(build_target_list(p_or_n, command, client_p, source_p, parv[1], parv[2]) < 0)
+ if(build_target_list(msgtype, client_p, source_p, parv[1], parv[2]) < 0)
{
- return 0;
+ return;
}
for(i = 0; i < ntargets; i++)
switch (targets[i].type)
{
case ENTITY_CHANNEL:
- msg_channel(p_or_n, command, client_p, source_p,
+ msg_channel(msgtype, client_p, source_p,
(struct Channel *) targets[i].ptr, parv[2]);
break;
case ENTITY_CHANNEL_OPMOD:
- msg_channel_opmod(p_or_n, command, client_p, source_p,
+ msg_channel_opmod(msgtype, client_p, source_p,
(struct Channel *) targets[i].ptr, parv[2]);
break;
case ENTITY_CHANOPS_ON_CHANNEL:
- msg_channel_flags(p_or_n, command, client_p, source_p,
+ msg_channel_flags(msgtype, client_p, source_p,
(struct Channel *) targets[i].ptr,
targets[i].flags, parv[2]);
break;
case ENTITY_CLIENT:
- msg_client(p_or_n, command, source_p,
+ msg_client(msgtype, source_p,
(struct Client *) targets[i].ptr, parv[2]);
break;
}
}
+}
- return 0;
+static void
+m_echo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
+ int parc, const char *parv[])
+{
+ struct Client *target_p = find_person(parv[2]);
+ enum message_type msgtype;
+
+ if (target_p == NULL)
+ return;
+
+ switch (parv[1][0])
+ {
+ case 'P': msgtype = MESSAGE_TYPE_PRIVMSG; break;
+ case 'N': msgtype = MESSAGE_TYPE_NOTICE; break;
+ default: return;
+ }
+
+ echo_msg(source_p, target_p, msgtype, parv[3]);
}
/*
* all the classic old bizzare oper privmsg tricks
* are parsed and sent as is, if prefixed with $
* to disambiguate.
- *
*/
static int
-build_target_list(int p_or_n, const char *command, struct Client *client_p,
+build_target_list(enum message_type msgtype, struct Client *client_p,
struct Client *source_p, const char *nicks_channels, const char *text)
{
int type;
}
/* non existant channel */
- else if(p_or_n != NOTICE)
+ else if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), nick);
if(EmptyString(nick))
{
sendto_one(source_p, form_str(ERR_NORECIPIENT),
- me.name, source_p->name, command);
+ me.name, source_p->name, cmdname[msgtype]);
continue;
}
get_id(&me, source_p),
get_id(source_p, source_p),
with_prefix);
- return (-1);
+ continue;
}
if(!duplicate_ptr(chptr))
targets[ntargets++].flags = type;
}
}
- else if(p_or_n != NOTICE)
+ else if(msgtype != MESSAGE_TYPE_NOTICE)
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), nick);
}
/* non existant channel */
- else if(p_or_n != NOTICE)
+ else if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), nick);
if(strchr(nick, '@') || (IsOper(source_p) && (*nick == '$')))
{
- handle_special(p_or_n, command, client_p, source_p, nick, text);
+ handle_special(msgtype, client_p, source_p, nick, text);
continue;
}
/* no matching anything found - error if not NOTICE */
- if(p_or_n != NOTICE)
+ if(msgtype != MESSAGE_TYPE_NOTICE)
{
/* dont give this numeric when source is local,
* because its misleading --anfl
* inputs - pointer to check
* - pointer to table of entities
* - number of valid entities so far
- * output - YES if duplicate pointer in table, NO if not.
+ * output - true if duplicate pointer in table, false if not.
* note, this does the canonize using pointers
* side effects - NONE
*/
-static int
+static bool
duplicate_ptr(void *ptr)
{
int i;
for(i = 0; i < ntargets; i++)
if(targets[i].ptr == ptr)
- return YES;
- return NO;
+ return true;
+ return false;
}
/*
* msg_channel
*
* inputs - flag privmsg or notice
- * - pointer to command "PRIVMSG" or "NOTICE"
* - pointer to client_p
* - pointer to source_p
* - pointer to channel
* XXX - We need to rework this a bit, it's a tad ugly. --nenolod
*/
static void
-msg_channel(int p_or_n, const char *command,
+msg_channel(enum message_type msgtype,
struct Client *client_p, struct Client *source_p, struct Channel *chptr,
const char *text)
{
int result;
- char text2[BUFSIZE];
+ hook_data_privmsg_channel hdata;
if(MyClient(source_p))
{
- /* idle time shouldnt be reset by notices --fl */
- if(p_or_n != NOTICE)
+ /* idle time shouldn't be reset by notices --fl */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
source_p->localClient->last = rb_current_time();
}
- if(chptr->mode.mode & MODE_NOCOLOR)
+ hdata.msgtype = msgtype;
+ hdata.source_p = source_p;
+ hdata.chptr = chptr;
+ hdata.text = text;
+ hdata.approved = 0;
+
+ call_hook(h_privmsg_channel, &hdata);
+
+ /* memory buffer address may have changed, update pointer */
+ text = hdata.text;
+
+ if (hdata.approved != 0)
+ return;
+
+ /* hook may have reduced the string to nothing. */
+ if (EmptyString(text))
{
- 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(p_or_n != NOTICE)
- sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return;
- }
+ /* 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 && MyClient(source_p) &&
+ !IsOperGeneral(source_p) &&
+ !add_channel_target(source_p, chptr))
+ {
+ sendto_one(source_p, form_str(ERR_TARGCHANGE),
+ me.name, source_p->name, chptr->chname);
+ return;
+ }
if(result == CAN_SEND_OPV ||
- !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
+ !flood_attack_channel(msgtype, source_p, chptr, chptr->chname))
{
- if (p_or_n != NOTICE && *text == '\001' &&
- strncasecmp(text + 1, "ACTION", 6))
- {
- 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", command, chptr->chname, text);
+ "%s %s :%s", cmdname[msgtype], chptr->chname, text);
}
}
else if(chptr->mode.mode & MODE_OPMODERATE &&
(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
IsMember(source_p, chptr)))
{
- if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
+ if(MyClient(source_p) && !IsOperGeneral(source_p) &&
+ !add_channel_target(source_p, chptr))
+ {
+ sendto_one(source_p, form_str(ERR_TARGCHANGE),
+ me.name, source_p->name, chptr->chname);
+ return;
+ }
+ if(!flood_attack_channel(msgtype, source_p, chptr, chptr->chname))
{
sendto_channel_opmod(client_p, source_p, chptr,
- command, text);
+ cmdname[msgtype], text);
}
}
else
{
- if(p_or_n != NOTICE)
+ if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
}
* msg_channel_opmod
*
* inputs - flag privmsg or notice
- * - pointer to command "PRIVMSG" or "NOTICE"
* - pointer to client_p
* - pointer to source_p
* - pointer to channel
* XXX - We need to rework this a bit, it's a tad ugly. --nenolod
*/
static void
-msg_channel_opmod(int p_or_n, const char *command,
+msg_channel_opmod(enum message_type msgtype,
struct Client *client_p, struct Client *source_p,
struct Channel *chptr, const char *text)
{
- char text2[BUFSIZE];
+ hook_data_privmsg_channel hdata;
+
+ hdata.msgtype = msgtype;
+ hdata.source_p = source_p;
+ hdata.chptr = chptr;
+ hdata.text = text;
+ hdata.approved = 0;
+
+ call_hook(h_privmsg_channel, &hdata);
+
+ /* memory buffer address may have changed, update pointer */
+ text = hdata.text;
+
+ if (hdata.approved != 0)
+ return;
- if(chptr->mode.mode & MODE_NOCOLOR)
+ /* hook may have reduced the string to nothing. */
+ if (EmptyString(text))
{
- 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(p_or_n != NOTICE)
- sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name);
- return;
- }
+ /* 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)))
{
- if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
+ if(!flood_attack_channel(msgtype, source_p, chptr, chptr->chname))
{
sendto_channel_opmod(client_p, source_p, chptr,
- command, text);
+ cmdname[msgtype], text);
}
}
else
{
- if(p_or_n != NOTICE)
+ if(msgtype != MESSAGE_TYPE_NOTICE)
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
}
/*
* 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 command, "PRIVMSG" or "NOTICE"
* - pointer to client_p
* - pointer to source_p
* - pointer to channel
* side effects - message given channel either chanop or voice
*/
static void
-msg_channel_flags(int p_or_n, const char *command, struct Client *client_p,
+msg_channel_flags(enum message_type msgtype, struct Client *client_p,
struct Client *source_p, struct Channel *chptr, int flags, const char *text)
{
int type;
char c;
+ hook_data_privmsg_channel hdata;
if(flags & CHFL_VOICE)
{
if(MyClient(source_p))
{
- /* idletime shouldnt be reset by notice --fl */
- if(p_or_n != NOTICE)
+ /* idle time shouldn't be reset by notices --fl */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
source_p->localClient->last = rb_current_time();
}
+ hdata.msgtype = msgtype;
+ hdata.source_p = source_p;
+ hdata.chptr = chptr;
+ hdata.text = text;
+ hdata.approved = 0;
+
+ call_hook(h_privmsg_channel, &hdata);
+
+ /* memory buffer address may have changed, update pointer */
+ text = hdata.text;
+
+ 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;
+ }
+
sendto_channel_flags(client_p, type, source_p, chptr, "%s %c%s :%s",
- command, c, chptr->chname, text);
+ cmdname[msgtype], c, chptr->chname, text);
}
static void
}
}
+static void
+echo_msg(struct Client *source_p, struct Client *target_p,
+ enum message_type msgtype, const char *text)
+{
+ if (MyClient(target_p))
+ {
+ if (!IsCapable(target_p, CLICAP_ECHO_MESSAGE))
+ return;
+
+ sendto_one(target_p, ":%s!%s@%s %s %s :%s",
+ target_p->name, target_p->username, target_p->host,
+ cmdname[msgtype],
+ source_p->name,
+ text);
+ return;
+ }
+
+ if (!(target_p->from->serv->caps & CAP_ECHO))
+ return;
+
+ sendto_one(target_p, ":%s ECHO %c %s :%s",
+ use_id(source_p),
+ msgtype == MESSAGE_TYPE_PRIVMSG ? 'P' : 'N',
+ use_id(target_p),
+ text);
+}
+
/*
* 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 command, "PRIVMSG" or "NOTICE"
* - pointer to source_p source (struct Client *)
* - pointer to target_p target (struct Client *)
* - pointer to text
* side effects - message given channel either chanop or voice
*/
static void
-msg_client(int p_or_n, const char *command,
+msg_client(enum message_type msgtype,
struct Client *source_p, struct Client *target_p, const char *text)
{
int do_floodcount = 0;
+ hook_data_privmsg_user hdata;
if(MyClient(source_p))
{
- /*
- * XXX: Controversial? Allow target users to send replies
- * through a +g. Rationale is that people can presently use +g
- * as a way to taunt users, e.g. harass them and hide behind +g
- * as a way of griefing. --nenolod
- */
- if(p_or_n != NOTICE && MyClient(source_p) &&
- IsSetCallerId(source_p) &&
- !accept_message(target_p, source_p) &&
- !IsOper(target_p))
- {
- if(rb_dlink_list_length(&source_p->localClient->allow_list) <
- ConfigFileEntry.max_accept)
- {
- rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
- rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
- }
- else
- {
- sendto_one_numeric(source_p, ERR_OWNMODE,
- form_str(ERR_OWNMODE),
- target_p->name, "+g");
- return;
- }
- }
-
- /* reset idle time for message only if its not to self
- * and its not a notice */
- if(p_or_n != NOTICE)
+ /* idle time shouldn't be reset by notices --fl */
+ if(msgtype != MESSAGE_TYPE_NOTICE)
source_p->localClient->last = rb_current_time();
/* auto cprivmsg/cnotice */
- do_floodcount = !IsOper(source_p) &&
+ do_floodcount = !IsOperGeneral(source_p) &&
!find_allowing_channel(source_p, target_p);
/* target change stuff, dont limit ctcp replies as that
* would allow people to start filling up random users
* targets just by ctcping them
*/
- if((p_or_n != NOTICE || *text != '\001') &&
+ if((msgtype != MESSAGE_TYPE_NOTICE || *text != '\001') &&
ConfigFileEntry.target_change && do_floodcount)
{
if(!add_target(source_p, target_p))
}
}
- if (do_floodcount && p_or_n == NOTICE && *text == '\001' &&
+ if (do_floodcount && msgtype == MESSAGE_TYPE_NOTICE && *text == '\001' &&
target_p->large_ctcp_sent + LARGE_CTCP_TIME >= rb_current_time())
do_floodcount = 0;
if (do_floodcount &&
- flood_attack_client(p_or_n, source_p, target_p))
+ flood_attack_client(msgtype, source_p, target_p))
return;
}
else if(source_p->from == target_p->from)
{
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
+ sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
"Send message to %s[%s] dropped from %s(Fake Dir)",
target_p->name, target_p->from->name, source_p->name);
return;
}
- if(MyConnect(source_p) && (p_or_n != NOTICE) && target_p->user && target_p->user->away)
+ if(MyConnect(source_p) && (msgtype != MESSAGE_TYPE_NOTICE) && target_p->user && target_p->user->away)
sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
target_p->name, target_p->user->away);
- if(MyClient(target_p))
- {
- /* 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])))
- {
- /* Here is the anti-flood bot/spambot code -db */
- if(accept_message(source_p, target_p) || IsOper(source_p))
- {
- add_reply_target(target_p, source_p);
- sendto_one(target_p, ":%s!%s@%s %s %s :%s",
- source_p->name,
- source_p->username,
- source_p->host, command, target_p->name, text);
- }
- else if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
- {
- if (p_or_n != NOTICE)
- sendto_one_numeric(source_p, ERR_NONONREG,
- form_str(ERR_NONONREG),
- target_p->name);
- }
- else
- {
- /* check for accept, flag recipient incoming message */
- if(p_or_n != NOTICE)
- {
- sendto_one_numeric(source_p, ERR_TARGUMODEG,
- form_str(ERR_TARGUMODEG),
- target_p->name);
- }
+ hdata.msgtype = msgtype;
+ hdata.source_p = source_p;
+ hdata.target_p = target_p;
+ hdata.text = text;
+ hdata.approved = 0;
- if((target_p->localClient->last_caller_id_time +
- ConfigFileEntry.caller_id_wait) < rb_current_time())
- {
- if(p_or_n != NOTICE)
- sendto_one_numeric(source_p, RPL_TARGNOTIFY,
- form_str(RPL_TARGNOTIFY),
- target_p->name);
+ call_hook(h_privmsg_user, &hdata);
- add_reply_target(target_p, source_p);
- sendto_one(target_p, form_str(RPL_UMODEGMSG),
- me.name, target_p->name, source_p->name,
- source_p->username, source_p->host);
+ /* buffer location may have changed. */
+ text = hdata.text;
- target_p->localClient->last_caller_id_time = rb_current_time();
- }
- }
- }
- else
+ if (hdata.approved != 0)
+ return;
+
+ if(MyClient(target_p))
+ {
+ if (EmptyString(text))
{
- add_reply_target(target_p, source_p);
- sendto_anywhere(target_p, source_p, command, ":%s", 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;
}
+
+ add_reply_target(target_p, source_p);
+ sendto_anywhere(target_p, source_p, cmdname[msgtype], ":%s", text);
+ echo_msg(target_p, source_p, msgtype, text);
}
else
- sendto_anywhere(target_p, source_p, command, ":%s", text);
+ sendto_anywhere(target_p, source_p, cmdname[msgtype], ":%s", text);
return;
}
/*
* flood_attack_client
* inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
- * say NOTICE must not auto reply
- * - pointer to source Client
+ * says NOTICE must not auto reply
+ * - pointer to source Client
* - pointer to target Client
- * output - 1 if target is under flood attack
+ * output - true if target is under flood attack
* side effects - check for flood attack on target target_p
*/
-static int
-flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p)
+static bool
+flood_attack_client(enum message_type msgtype, struct Client *source_p, struct Client *target_p)
{
int delta;
* and msg user@server.
* -- jilles
*/
- if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p))
+ if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p) && !HasPrivilege(target_p, "oper:free_target"))
{
if((target_p->first_received_message_time + 1) < rb_current_time())
{
/* add a bit of penalty */
target_p->received_number_of_privmsgs += 2;
}
- if(MyClient(source_p) && (p_or_n != NOTICE))
+ if(MyClient(source_p) && (msgtype != MESSAGE_TYPE_NOTICE))
sendto_one(source_p,
":%s NOTICE %s :*** Message to %s throttled due to flooding",
me.name, source_p->name, target_p->name);
- return 1;
+ return true;
}
else
target_p->received_number_of_privmsgs++;
}
- return 0;
+ return false;
}
-/*
- * flood_attack_channel
- * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
- * says NOTICE must not auto reply
- * - pointer to source Client
- * - pointer to target channel
- * output - 1 if target is under flood attack
- * side effects - check for flood attack on target chptr
- */
-static int
-flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, char *chname)
-{
- int delta;
-
- if(GlobalSetOptions.floodcount && MyClient(source_p))
- {
- if((chptr->first_received_message_time + 1) < rb_current_time())
- {
- delta = rb_current_time() - chptr->first_received_message_time;
- chptr->received_number_of_privmsgs -= delta;
- chptr->first_received_message_time = rb_current_time();
- if(chptr->received_number_of_privmsgs <= 0)
- {
- chptr->received_number_of_privmsgs = 0;
- chptr->flood_noticed = 0;
- }
- }
-
- if((chptr->received_number_of_privmsgs >= GlobalSetOptions.floodcount)
- || chptr->flood_noticed)
- {
- if(chptr->flood_noticed == 0)
- {
- sendto_realops_snomask(SNO_BOTS, *chptr->chname == '&' ? L_ALL : L_NETWIDE,
- "Possible Flooder %s[%s@%s] on %s target: %s",
- source_p->name, source_p->username,
- source_p->orighost,
- source_p->servptr->name, chptr->chname);
- chptr->flood_noticed = 1;
-
- /* Add a bit of penalty */
- chptr->received_number_of_privmsgs += 2;
- }
- if(MyClient(source_p) && (p_or_n != NOTICE))
- sendto_one(source_p,
- ":%s NOTICE %s :*** Message to %s throttled due to flooding",
- me.name, source_p->name, chptr->chname);
- return 1;
- }
- else
- chptr->received_number_of_privmsgs++;
- }
-
- return 0;
-}
-
-
/*
* handle_special
*
* This disambiguates the syntax.
*/
static void
-handle_special(int p_or_n, const char *command, struct Client *client_p,
+handle_special(enum message_type msgtype, struct Client *client_p,
struct Client *source_p, const char *nick, const char *text)
{
struct Client *target_p;
char *server;
- char *s;
/* user[%host]@server addressed?
* NOTE: users can send to user@server, but not user%host@server
if(!IsMe(target_p))
{
sendto_one(target_p, ":%s %s %s :%s",
- get_id(source_p, target_p), command, nick, text);
+ get_id(source_p, target_p), cmdname[msgtype], nick, text);
return;
}
{
sendto_one(source_p,
":%s NOTICE %s :The command %s %s is no longer supported, please use $%s",
- me.name, source_p->name, command, nick, nick);
+ me.name, source_p->name, cmdname[msgtype], nick, nick);
return;
}
return;
}
- if((s = strrchr(nick, '.')) == NULL)
- {
- sendto_one_numeric(source_p, ERR_NOTOPLEVEL,
- form_str(ERR_NOTOPLEVEL), nick);
- return;
- }
- while(*++s)
- if(*s == '.' || *s == '*' || *s == '?')
- break;
- if(*s == '*' || *s == '?')
+ if(MyClient(source_p))
{
- sendto_one_numeric(source_p, ERR_WILDTOPLEVEL,
- form_str(ERR_WILDTOPLEVEL), nick);
- return;
+ sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, "%s sent mass-%s to %s: %s",
+ get_oper_name(source_p),
+ msgtype == MESSAGE_TYPE_PRIVMSG ? "privmsg" : "notice",
+ nick, text);
}
sendto_match_butone(IsServer(client_p) ? client_p : NULL, source_p,
nick + 1,
(*nick == '#') ? MATCH_HOST : MATCH_SERVER,
- "%s $%s :%s", command, nick, text);
- if (p_or_n != NOTICE && *text == '\001')
+ "%s $%s :%s", cmdname[msgtype], nick, text);
+ if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001')
source_p->large_ctcp_sent = rb_current_time();
return;
}
projects / solanum.git / blobdiff