#include "send.h"
#include "s_newconf.h"
#include "s_stats.h"
+#include "tgchange.h"
#include "inline/stringops.h"
static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
struct Client *client_p,
struct Client *source_p, const char *nicks_channels, const char *text);
-static struct Channel *find_allowing_channel(struct Client *source_p, struct Client *target_p);
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);
+/* Fifteen seconds should be plenty for a client to reply a ctcp */
+#define LARGE_CTCP_TIME 15
+
#define ENTITY_NONE 0
#define ENTITY_CHANNEL 1
-#define ENTITY_CHANOPS_ON_CHANNEL 2
-#define ENTITY_CLIENT 3
+#define ENTITY_CHANNEL_OPMOD 2
+#define ENTITY_CHANOPS_ON_CHANNEL 3
+#define ENTITY_CLIENT 4
static struct entity targets[512];
static int ntargets = 0;
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,
+ 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,
struct Client *client_p,
struct Client *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,
+ (struct Channel *) targets[i].ptr, parv[2]);
+ break;
+
case ENTITY_CHANOPS_ON_CHANNEL:
msg_channel_flags(p_or_n, command, client_p, source_p,
(struct Channel *) targets[i].ptr,
if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr))
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, with_prefix);
+ get_id(&me, source_p),
+ get_id(source_p, source_p),
+ with_prefix);
return (-1);
}
continue;
}
+ if(IsServer(client_p) && *nick == '=' && nick[1] == '#')
+ {
+ nick++;
+ if((chptr = find_channel(nick)) != NULL)
+ {
+ if(!duplicate_ptr(chptr))
+ {
+ if(ntargets >= ConfigFileEntry.max_targets)
+ {
+ sendto_one(source_p, form_str(ERR_TOOMANYTARGETS),
+ me.name, source_p->name, nick);
+ return (1);
+ }
+ targets[ntargets].ptr = (void *) chptr;
+ targets[ntargets++].type = ENTITY_CHANNEL_OPMOD;
+ }
+ }
+
+ /* non existant channel */
+ else if(p_or_n != NOTICE)
+ sendto_one_numeric(source_p, ERR_NOSUCHNICK,
+ form_str(ERR_NOSUCHNICK), nick);
+
+ continue;
+ }
+
if(strchr(nick, '@') || (IsOper(source_p) && (*nick == '$')))
{
handle_special(p_or_n, command, client_p, source_p, nick, text);
if(result == CAN_SEND_OPV ||
!flood_attack_channel(p_or_n, 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);
}
}
else if(chptr->mode.mode & MODE_OPMODERATE &&
- chptr->mode.mode & MODE_MODERATED &&
- IsMember(source_p, chptr))
+ (!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
+ IsMember(source_p, chptr)))
{
- /* only do +z for +m channels for now, as bans/quiets
- * aren't tested for remote clients -- jilles */
if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
{
- sendto_channel_flags(client_p, ONLY_CHANOPS, source_p, chptr,
- "%s %s :%s", command, chptr->chname, text);
+ sendto_channel_opmod(client_p, source_p, chptr,
+ command, text);
+ }
+ }
+ else
+ {
+ if(p_or_n != 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
+ * output - NONE
+ * side effects - message given channel ops
+ *
+ * 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,
+ struct Client *client_p, struct Client *source_p,
+ struct Channel *chptr, const char *text)
+{
+ char text2[BUFSIZE];
+
+ 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(p_or_n != 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))
+ {
+ sendto_channel_opmod(client_p, source_p, chptr,
+ command, text);
}
}
else
command, c, chptr->chname, text);
}
-#define PREV_FREE_TARGET(x) ((FREE_TARGET(x) == 0) ? 9 : FREE_TARGET(x) - 1)
-#define PREV_TARGET(i) ((i == 0) ? i = 9 : --i)
-#define NEXT_TARGET(i) ((i == 9) ? i = 0 : ++i)
-
static void
expire_tgchange(void *unused)
{
}
}
-static int
-add_target(struct Client *source_p, struct Client *target_p)
-{
- int i, j;
- uint32_t hashv;
-
- /* can msg themselves or services without using any target slots */
- if(source_p == target_p || IsService(target_p))
- return 1;
-
- /* special condition for those who have had PRIVMSG crippled to allow them
- * to talk to IRCops still.
- *
- * XXX: is this controversial?
- */
- if(source_p->localClient->target_last > rb_current_time() && IsOper(target_p))
- return 1;
-
- hashv = fnv_hash_upper((const unsigned char *)use_id(target_p), 32);
-
- if(USED_TARGETS(source_p))
- {
- /* hunt for an existing target */
- for(i = PREV_FREE_TARGET(source_p), j = USED_TARGETS(source_p);
- j; --j, PREV_TARGET(i))
- {
- if(source_p->localClient->targets[i] == hashv)
- return 1;
- }
-
- /* first message after connect, we may only start clearing
- * slots after this message --anfl
- */
- if(!IsTGChange(source_p))
- {
- SetTGChange(source_p);
- source_p->localClient->target_last = rb_current_time();
- }
- /* clear as many targets as we can */
- else if((i = (rb_current_time() - source_p->localClient->target_last) / 60))
- {
- if(i > USED_TARGETS(source_p))
- USED_TARGETS(source_p) = 0;
- else
- USED_TARGETS(source_p) -= i;
-
- source_p->localClient->target_last = rb_current_time();
- }
- /* cant clear any, full target list */
- else if(USED_TARGETS(source_p) == 10)
- {
- ServerStats.is_tgch++;
- add_tgchange(source_p->sockhost);
- return 0;
- }
- }
- /* no targets in use, reset their target_last so that they cant
- * abuse a long idle to get targets back more quickly
- */
- else
- {
- source_p->localClient->target_last = rb_current_time();
- SetTGChange(source_p);
- }
-
- source_p->localClient->targets[FREE_TARGET(source_p)] = hashv;
- NEXT_TARGET(FREE_TARGET(source_p));
- ++USED_TARGETS(source_p);
- return 1;
-}
-
/*
* msg_client
*
return;
}
}
+
+ if (do_floodcount && p_or_n == 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))
+ return;
}
else if(source_p->from == target_p->from)
{
/* 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,
sendto_one_numeric(source_p, ERR_NONONREG,
form_str(ERR_NONONREG),
target_p->name);
- /* Only so opers can watch for floods */
- if (do_floodcount)
- (void) flood_attack_client(p_or_n, source_p, target_p);
}
else
{
form_str(RPL_TARGNOTIFY),
target_p->name);
+ 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);
target_p->localClient->last_caller_id_time = rb_current_time();
}
- /* Only so opers can watch for floods */
- if (do_floodcount)
- (void) flood_attack_client(p_or_n, source_p, target_p);
}
}
else
{
- /* If the client is remote, we dont perform a special check for
- * flooding.. as we wouldnt block their message anyway.. this means
- * we dont give warnings.. we then check if theyre opered
- * (to avoid flood warnings), lastly if theyre our client
- * and flooding -- fl */
- if(!do_floodcount ||
- !flood_attack_client(p_or_n, source_p, target_p))
- sendto_anywhere(target_p, source_p, command, ":%s", text);
+ add_reply_target(target_p, source_p);
+ sendto_anywhere(target_p, source_p, command, ":%s", text);
}
}
- else if(!do_floodcount ||
- !flood_attack_client(p_or_n, source_p, target_p))
+ else
sendto_anywhere(target_p, source_p, command, ":%s", text);
return;
}
-static struct Channel *
-find_allowing_channel(struct Client *source_p, struct Client *target_p)
-{
- rb_dlink_node *ptr;
- struct membership *msptr;
-
- RB_DLINK_FOREACH(ptr, source_p->user->channel.head)
- {
- msptr = ptr->data;
- if (is_chanop_voiced(msptr) && IsMember(target_p, msptr->chptr))
- return msptr->chptr;
- }
- return NULL;
-}
-
/*
* flood_attack_client
* inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC
nick + 1,
(*nick == '#') ? MATCH_HOST : MATCH_SERVER,
"%s $%s :%s", command, nick, text);
+ if (p_or_n != NOTICE && *text == '\001')
+ source_p->large_ctcp_sent = rb_current_time();
return;
}
}