#include "stdinc.h"
#include "client.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_conf.h"
#include "s_serv.h"
#include "send.h"
#include "channel.h"
-#include "s_log.h"
+#include "logger.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
static int ms_save(struct Client *, struct Client *, int, const char **);
static int can_save(struct Client *);
static void save_user(struct Client *, struct Client *, struct Client *);
+static void bad_nickname(struct Client *, const char *);
struct Message nick_msgtab = {
"NICK", 0, 0, 0, MFLG_SLOW,
*s = '\0';
/* copy the nick and terminate it */
- strlcpy(nick, parv[1], sizeof(nick));
+ rb_strlcpy(nick, parv[1], sizeof(nick));
/* check the nickname is ok */
if(!clean_nick(nick, 1))
flood_endgrace(source_p);
/* terminate nick to NICKLEN, we dont want clean_nick() to error! */
- strlcpy(nick, parv[1], sizeof(nick));
+ rb_strlcpy(nick, parv[1], sizeof(nick));
/* check the nickname is ok */
if(!clean_nick(nick, 1))
/* if nicks erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad Nick: %s From: %s(via %s)",
- parv[1], source_p->servptr->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
-
- /* bad nick change, issue kill for the old nick to the rest
- * of the network.
- */
- kill_client_serv_butone(client_p, source_p, "%s (Bad Nickname)", me.name);
- source_p->flags |= FLAGS_KILLED;
- exit_client(client_p, source_p, &me, "Bad Nickname");
+ bad_nickname(client_p, parv[1]);
return 0;
}
{
struct Client *target_p;
time_t newts = 0;
+ char squitreason[100];
if(parc != 9)
{
"with %d arguments (expecting 9)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'NICK' from %s.",
parc, client_p->name);
- exit_client(client_p, client_p, client_p, "Excess parameters to NICK command");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Excess parameters (%d) to %s command, expecting %d",
+ parc, "NICK", 9);
+ exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
/* if nicks empty, erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad Nick: %s From: %s(via %s)",
- parv[1], parv[7], client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
+ bad_nickname(client_p, parv[1]);
return 0;
}
/* invalid username or host? */
if(!clean_username(parv[5]) || !clean_host(parv[6]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad user@host: %s@%s From: %s(via %s)",
parv[5], parv[6], parv[7], client_p->name);
{
struct Client *target_p;
time_t newts = 0;
+ char squitreason[120];
newts = atol(parv[3]);
"with %d arguments (expecting 10)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'UID' from %s.",
parc, client_p->name);
- exit_client(client_p, client_p, client_p, "Excess parameters to UID command");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Excess parameters (%d) to %s command, expecting %d",
+ parc, "UID", 10);
+ exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
/* if nicks erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad Nick: %s From: %s(via %s)",
- parv[1], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+ bad_nickname(client_p, parv[1]);
return 0;
}
- if(!clean_username(parv[5]) || !clean_host(parv[6]))
+ if(!clean_uid(parv[8]))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad user@host: %s@%s From: %s(via %s)",
- parv[5], parv[6], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Invalid UID %s for nick %s on %s",
+ parv[8], parv[1], source_p->name);
+ exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
- if(!clean_uid(parv[8]))
+ if(!clean_username(parv[5]) || !clean_host(parv[6]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad UID: %s From: %s(via %s)",
- parv[8], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
+ "Bad user@host: %s@%s From: %s(via %s)",
+ parv[5], parv[6], source_p->name, client_p->name);
+ sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
return 0;
}
{
struct Client *target_p;
time_t newts = 0;
+ char squitreason[120];
newts = atol(parv[3]);
"with %d arguments (expecting 12)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'EUID' from %s.",
parc, client_p->name);
- exit_client(client_p, client_p, client_p, "Excess parameters to EUID command");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Excess parameters (%d) to %s command, expecting %d",
+ parc, "EUID", 12);
+ exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
/* if nicks erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad Nick: %s From: %s(via %s)",
- parv[1], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+ bad_nickname(client_p, parv[1]);
return 0;
}
- if(!clean_username(parv[5]) || !clean_host(parv[6]))
+ if(!clean_uid(parv[8]))
{
- ServerStats->is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad user@host: %s@%s From: %s(via %s)",
- parv[5], parv[6], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Invalid UID %s for nick %s on %s",
+ parv[8], parv[1], source_p->name);
+ exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
- if(!clean_uid(parv[8]))
+ if(!clean_username(parv[5]) || !clean_host(parv[6]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
- "Bad UID: %s From: %s(via %s)",
- parv[8], source_p->name, client_p->name);
- sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
+ "Bad user@host: %s@%s From: %s(via %s)",
+ parv[5], parv[6], source_p->name, client_p->name);
+ sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
return 0;
}
if(strcmp(parv[9], "*") && !clean_host(parv[9]))
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad realhost: %s From: %s(via %s)",
parv[9], source_p->name, client_p->name);
char note[NICKLEN + 10];
/* This had to be copied here to avoid problems.. */
- source_p->tsinfo = CurrentTime;
+ source_p->tsinfo = rb_current_time();
if(source_p->name[0])
del_from_client_hash(source_p->name, source_p);
if(source_p->flags & FLAGS_SENTUSER)
{
- strlcpy(buf, source_p->username, sizeof(buf));
+ rb_strlcpy(buf, source_p->username, sizeof(buf));
/* got user, heres nick. */
register_local_user(client_p, source_p, buf);
nick, chptr->chname);
return;
}
- if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < CurrentTime)
+ if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
source_p->localClient->number_of_nick_changes = 0;
- source_p->localClient->last_nick_change = CurrentTime;
+ source_p->localClient->last_nick_change = rb_current_time();
source_p->localClient->number_of_nick_changes++;
if(ConfigFileEntry.anti_nick_flood && !IsOper(source_p) &&
if(!samenick)
{
/* force the TS to increase -- jilles */
- if (source_p->tsinfo >= CurrentTime)
+ if (source_p->tsinfo >= rb_current_time())
source_p->tsinfo++;
else
- source_p->tsinfo = CurrentTime;
+ source_p->tsinfo = rb_current_time();
monitor_signoff(source_p);
/* we only do bancache for local users -- jilles */
if(source_p->user)
{
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
use_id(source_p), nick, (long) source_p->tsinfo);
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
- source_p->name, nick, (long) source_p->tsinfo);
}
}
/* client changing their nick - dont reset ts if its same */
if(!samenick)
{
- source_p->tsinfo = newts ? newts : CurrentTime;
+ source_p->tsinfo = newts ? newts : rb_current_time();
monitor_signoff(source_p);
}
{
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
use_id(source_p), nick, (long) source_p->tsinfo);
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
- source_p->name, nick, (long) source_p->tsinfo);
}
}
/* if we dont have a ts, or their TS's are the same, kill both */
if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo))
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick collision on %s(%s <- %s)(both %s)",
target_p->name, target_p->from->name, client_p->name, action);
if (use_save)
{
save_user(&me, &me, target_p);
- ServerStats->is_save++;
+ ServerStats.is_save++;
sendto_one(client_p, ":%s SAVE %s %ld", me.id,
uid, (long)newts);
register_client(client_p, source_p,
/* we then need to KILL the old client everywhere */
kill_client_serv_butone(NULL, target_p, "%s (Nick collision (new))", me.name);
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
target_p->flags |= FLAGS_KILLED;
exit_client(client_p, target_p, &me, "Nick collision (new)");
else
{
if(sameuser)
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick collision on %s(%s <- %s)(older %s)",
target_p->name, target_p->from->name,
client_p->name, action);
else
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick collision on %s(%s <- %s)(newer %s)",
target_p->name, target_p->from->name,
client_p->name, action);
if (use_save)
{
- ServerStats->is_save++;
+ ServerStats.is_save++;
save_user(&me, &me, target_p);
}
else
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
/* its a client changing nick and causing a collide */
if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo) || !source_p->user)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick change collision from %s to %s(%s <- %s)(both %s)",
source_p->name, target_p->name, target_p->from->name,
client_p->name, action);
if (use_save)
{
- ServerStats->is_save += 2;
+ ServerStats.is_save += 2;
save_user(&me, &me, target_p);
sendto_one(client_p, ":%s SAVE %s %ld", me.id,
source_p->id, (long)newts);
}
else
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
(!sameuser && newts > target_p->tsinfo))
{
if(sameuser)
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick change collision from %s to %s(%s <- %s)(older %s)",
source_p->name, target_p->name,
target_p->from->name, client_p->name, action);
else
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick change collision from %s to %s(%s <- %s)(newer %s)",
source_p->name, target_p->name,
target_p->from->name, client_p->name, action);
if (use_save)
{
- ServerStats->is_save++;
+ ServerStats.is_save++;
/* can't broadcast a SAVE because the
* nickchange has happened at client_p
* but not in other directions -- jilles */
}
else
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
else
{
if(sameuser)
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick collision on %s(%s <- %s)(older %s)",
target_p->name, target_p->from->name,
client_p->name, action);
else
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_ALL,
"Nick collision on %s(%s <- %s)(newer %s)",
target_p->name, target_p->from->name,
client_p->name, action);
if (use_save)
{
- ServerStats->is_save++;
+ ServerStats.is_save++;
save_user(&me, &me, target_p);
}
else
/* kill the client who existed before hand */
kill_client_serv_butone(client_p, target_p, "%s (Nick collision)", me.name);
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
target_p->flags |= FLAGS_KILLED;
(void) exit_client(client_p, target_p, &me, "Nick collision");
source_p->tsinfo = newts;
strcpy(source_p->name, nick);
- strlcpy(source_p->username, parv[5], sizeof(source_p->username));
- strlcpy(source_p->host, parv[6], sizeof(source_p->host));
- strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
+ rb_strlcpy(source_p->username, parv[5], sizeof(source_p->username));
+ rb_strlcpy(source_p->host, parv[6], sizeof(source_p->host));
+ rb_strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
if(parc == 12)
{
- strlcpy(source_p->info, parv[11], sizeof(source_p->info));
- strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
- strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+ rb_strlcpy(source_p->info, parv[11], sizeof(source_p->info));
+ rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+ rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
add_to_id_hash(source_p->id, source_p);
if (strcmp(parv[9], "*"))
{
- strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
+ rb_strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
if (irccmp(source_p->host, source_p->orighost))
SetDynSpoof(source_p);
}
if (strcmp(parv[10], "*"))
- strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
+ rb_strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
}
else if(parc == 10)
{
- strlcpy(source_p->info, parv[9], sizeof(source_p->info));
- strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
- strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+ rb_strlcpy(source_p->info, parv[9], sizeof(source_p->info));
+ rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+ rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
add_to_id_hash(source_p->id, source_p);
}
else
{
- strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+ rb_strlcpy(source_p->info, parv[8], sizeof(source_p->info));
}
/* remove any nd entries for this nick */
"Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)",
target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name);
kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name);
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
target_p->flags |= FLAGS_KILLED;
(void) exit_client(NULL, target_p, &me, "Nick collision (no SAVE support)");
source_p->id, target_p->id, (long)target_p->tsinfo);
sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld",
target_p->id, target_p->id, (long)SAVE_NICKTS);
- sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
- target_p->name, target_p->id, (long)SAVE_NICKTS);
if (!IsMe(client_p))
sendto_realops_snomask(SNO_SKILL, L_ALL,
"Received SAVE message for %s from %s",
else
change_remote_nick(target_p, target_p, SAVE_NICKTS, target_p->id, 0);
}
+
+static void bad_nickname(struct Client *client_p, const char *nick)
+{
+ char squitreason[100];
+
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+ client_p->name, nick);
+ sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+ ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+ me.id, client_p->name, nick);
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Bad nickname introduced [%s]", nick);
+ exit_client(client_p, client_p, &me, squitreason);
+}
projects / solanum.git / blobdiff