X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/66b4a7ae7a53f020bca9becf8447aff6e304d09d..cea2bc8499f1d250587228330ab4336452bf1a6f:/modules/core/m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 3a58402..352de58 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -27,7 +27,7 @@
 #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"
@@ -38,7 +38,7 @@
 #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"
@@ -64,6 +64,7 @@ static int ms_euid(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,
@@ -138,7 +139,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 		*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))
@@ -156,7 +157,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 		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);
@@ -202,7 +203,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		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))
@@ -217,7 +218,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		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);
@@ -281,18 +282,7 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* 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;
 	}
 
@@ -343,18 +333,14 @@ ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* 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);
@@ -435,17 +421,13 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	/* 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);
@@ -455,7 +437,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 	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);
@@ -527,17 +509,13 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* 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);
@@ -547,7 +525,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	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);
@@ -557,7 +535,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	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);
@@ -731,21 +709,22 @@ static void
 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);
@@ -758,8 +737,9 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 		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)
@@ -772,10 +752,10 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 					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) &&
@@ -794,10 +774,10 @@ change_local_nick(struct Client *client_p, struct Client *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)
@@ -841,16 +821,16 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 	 * 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;
 }
@@ -868,7 +848,7 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
 	/* 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);
 	}
 
@@ -890,7 +870,7 @@ change_remote_nick(struct Client *client_p, struct Client *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);
@@ -928,7 +908,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 		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,
@@ -948,7 +928,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_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)");
@@ -996,12 +976,12 @@ perform_nick_collides(struct Client *source_p, struct Client *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);
 
@@ -1045,7 +1025,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 		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);
@@ -1055,13 +1035,13 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 		}
 		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);
 
@@ -1093,7 +1073,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			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 */
@@ -1105,7 +1085,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 			}
 			else
 			{
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						form_str(ERR_NICKCOLLISION), target_p->name);
@@ -1138,7 +1118,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				save_user(&me, &me, target_p);
 			}
 			else
@@ -1149,7 +1129,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 				/* 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");
@@ -1172,50 +1152,60 @@ register_client(struct Client *client_p, struct Client *server,
 	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);
@@ -1230,11 +1220,11 @@ register_client(struct Client *client_p, struct Client *server,
 		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;
@@ -1261,29 +1251,16 @@ register_client(struct Client *client_p, struct Client *server,
 	}
 
 	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)
@@ -1294,10 +1271,10 @@ register_client(struct Client *client_p, struct Client *server,
 				     "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");
 	}
@@ -1340,7 +1317,7 @@ save_user(struct Client *client_p, struct Client *source_p,
 				"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)");
@@ -1366,3 +1343,22 @@ save_user(struct Client *client_p, struct Client *source_p,
 	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);
+	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);
+}