* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_nick.c 3418 2007-04-22 11:22:10Z jilles $
+ * $Id: m_nick.c 3518 2007-06-22 21:59:09Z jilles $
*/
#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"
#include "s_newconf.h"
#include "monitor.h"
+/* Give all UID nicks the same TS. This ensures nick TS is always the same on
+ * all servers for each nick-user pair, also if a user with a UID nick changes
+ * their nick but is collided again (the server detecting the collision will
+ * not propagate the nick change further). -- jilles
+ */
+#define SAVE_NICKTS 100
+
static int mr_nick(struct Client *, struct Client *, int, const char **);
static int m_nick(struct Client *, struct Client *, int, const char **);
static int mc_nick(struct Client *, struct Client *, int, const char **);
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,
mapi_clist_av1 nick_clist[] = { &nick_msgtab, &uid_msgtab, &euid_msgtab,
&save_msgtab, NULL };
-DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3418 $");
+DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3518 $");
static int change_remote_nick(struct Client *, struct Client *, time_t,
const char *, int);
*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))
return 0;
}
- if(hash_find_nd(nick))
+ if(irc_dictionary_find(nd_dict, nick))
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
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))
return 0;
}
- if(hash_find_nd(nick))
+ if(irc_dictionary_find(nd_dict, nick))
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
/* 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->user->server, 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;
}
/* 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);
/* 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]))
{
- 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], source_p->name, client_p->name);
if(!clean_uid(parv[8]))
{
- 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);
/* 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]))
{
- 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], source_p->name, client_p->name);
if(!clean_uid(parv[8]))
{
- 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);
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);
set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
{
char buf[USERLEN + 1];
+ 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);
strcpy(source_p->name, nick);
add_to_client_hash(nick, source_p);
- /* fd_desc is long enough */
- comm_note(client_p->localClient->fd, "Nick: %s", nick);
+ rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+ rb_note(client_p->localClient->F, note);
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);
char *nick, int dosend)
{
struct Client *target_p;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
struct Channel *chptr;
+ char note[NICKLEN + 10];
int samenick;
if (dosend)
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)
* to clear a clients own list of accepted clients. So just remove
* them from everyone elses list --anfl
*/
- DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head)
{
target_p = ptr->data;
- dlinkFindDestroy(source_p, &target_p->localClient->allow_list);
- dlinkDestroy(ptr, &source_p->on_allow_list);
+ rb_dlinkFindDestroy(source_p, &target_p->localClient->allow_list);
+ rb_dlinkDestroy(ptr, &source_p->on_allow_list);
}
- /* fd_desc is long enough */
- comm_note(client_p->localClient->fd, "Nick: %s", nick);
+ rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+ rb_note(client_p->localClient->F, note);
return;
}
/* 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);
}
del_from_client_hash(source_p->name, source_p);
/* invalidate nick delay when a remote client uses the nick.. */
- if((nd = hash_find_nd(nick)))
+ if((nd = irc_dictionary_retrieve(nd_dict, nick)))
free_nd_entry(nd);
strcpy(source_p->name, nick);
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,
- uid, newts, parc, parv);
+ uid, SAVE_NICKTS, parc, parv);
}
else
{
/* 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)");
sendto_one(client_p, ":%s SAVE %s %ld", me.id,
uid, (long)newts);
register_client(client_p, source_p,
- uid, newts, parc, parv);
+ uid, SAVE_NICKTS, parc, parv);
}
else if(uid)
sendto_one(client_p,
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);
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);
/* don't send a redundant nick change */
if (!IsDigit(source_p->name[0]))
- change_remote_nick(client_p, source_p, CurrentTime, source_p->id, 1);
+ change_remote_nick(client_p, source_p, SAVE_NICKTS, source_p->id, 1);
}
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);
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 */
sendto_one(client_p, ":%s SAVE %s %ld", me.id,
source_p->id, (long)newts);
- /* same CurrentTime as in save_user() */
/* send a :<id> NICK <id> <ts> (!) */
if (!IsDigit(source_p->name[0]))
- change_remote_nick(client_p, source_p, CurrentTime, source_p->id, 1);
+ change_remote_nick(client_p, source_p, SAVE_NICKTS, source_p->id, 1);
}
else
{
- ServerStats->is_kill++;
+ ServerStats.is_kill++;
sendto_one_numeric(target_p, ERR_NICKCOLLISION,
form_str(ERR_NICKCOLLISION), target_p->name);
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");
const char *m;
int flag;
+ if(server == NULL)
+ {
+ if((server = find_server(NULL, parv[7])) == NULL)
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Ghost killed: %s on invalid server %s",
+ nick, parv[7]);
+ sendto_one(client_p, ":%s KILL %s :%s (Server doesn't exist)",
+ get_id(&me, client_p), nick, me.name);
+ return 0;
+ }
+ }
+
source_p = make_client(client_p);
user = make_user(source_p);
- dlinkAddTail(source_p, &source_p->node, &global_client_list);
+ rb_dlinkAddTail(source_p, &source_p->node, &global_client_list);
source_p->hopcount = atoi(parv[2]);
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)
{
- user->server = find_or_add(server->name);
- 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)
{
- user->server = find_or_add(server->name);
- 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
{
- user->server = find_or_add(parv[7]);
- 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 */
- if((nd = hash_find_nd(nick)))
+ if((nd = irc_dictionary_retrieve(nd_dict, nick)))
free_nd_entry(nd);
add_to_client_hash(nick, source_p);
- add_to_hostname_hash(source_p->host, source_p);
+ add_to_hostname_hash(source_p->orighost, source_p);
monitor_signon(source_p);
m = &parv[4][1];
if(flag & UMODE_SERVICE)
{
int hit = 0;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, service_list.head)
+ RB_DLINK_FOREACH(ptr, service_list.head)
{
- if(!irccmp((const char *) ptr->data, user->server))
+ if(!irccmp((const char *) ptr->data, server->name))
{
hit++;
break;
}
if(IsOper(source_p) && !IsService(source_p))
- dlinkAddAlloc(source_p, &oper_list);
+ rb_dlinkAddAlloc(source_p, &oper_list);
SetRemoteClient(source_p);
if(++Count.total > Count.max_tot)
Count.max_tot = Count.total;
- if(server == NULL)
- {
- if((source_p->servptr = find_server(NULL, user->server)) == NULL)
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Ghost killed: %s on invalid server %s",
- source_p->name, user->server);
- kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
- source_p->flags |= FLAGS_KILLED;
- return exit_client(NULL, source_p, &me, "Ghosted Client");
- }
- }
- else
- source_p->servptr = server;
+ source_p->servptr = server;
- dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+ rb_dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
/* fake direction */
if(source_p->servptr->from != source_p->from)
"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
client_p->name, source_p->name,
source_p->username, source_p->host,
- user->server, target_p->name, target_p->from->name);
+ server->name, target_p->name, target_p->from->name);
kill_client(client_p, source_p,
"%s (NICK from wrong direction (%s != %s))",
- me.name, user->server, target_p->from->name);
+ me.name, server->name, target_p->from->name);
source_p->flags |= FLAGS_KILLED;
return exit_client(source_p, source_p, &me, "USER server wrong direction");
}
"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)");
sendto_server(client_p, NULL, CAP_SAVE|CAP_TS6, NOCAPS, ":%s SAVE %s %ld",
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)CurrentTime);
+ 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)CurrentTime);
+ 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",
sendto_one_numeric(target_p, RPL_SAVENICK,
form_str(RPL_SAVENICK), target_p->id);
change_local_nick(target_p, target_p, target_p->id, 0);
+ target_p->tsinfo = SAVE_NICKTS;
}
else
- {
- /* XXX the uid nick gets garbage TS; shouldn't matter though */
- change_remote_nick(target_p, target_p, CurrentTime, target_p->id, 0);
- }
+ 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);
+ sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
+ ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+ me.name, client_p->name, nick);
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Bad nickname introduced [%s]", nick);
+ exit_client(client_p, client_p, &me, squitreason);
}
projects / irc / rqf / shadowircd.git / blobdiff