X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/8c689f969db3e81b23ad1bdace924f6f28afa7e0..9e7c93067226337decd23dd4fa0ed40dc123f6f4:/src/client.c

diff --git a/src/client.c b/src/client.c
index 54eeaf5a..4edfe35b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -31,10 +31,8 @@
 #include "class.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
-#include "s_gline.h"
 #include "numeric.h"
 #include "packet.h"
 #include "s_auth.h"
@@ -56,6 +54,8 @@
 #include "reject.h"
 #include "scache.h"
 #include "irc_dictionary.h"
+#include "sslproc.h"
+#include "s_assert.h"
 
 #define DEBUG_EXITED_CLIENTS
 
@@ -73,20 +73,19 @@ static int qs_server(struct Client *, struct Client *, struct Client *, const ch
 
 static EVH check_pings;
 
-extern rb_bh *client_heap;
-extern rb_bh *lclient_heap;
-extern rb_bh *pclient_heap;
+static rb_bh *client_heap = NULL;
+static rb_bh *lclient_heap = NULL;
+static rb_bh *pclient_heap = NULL;
+static rb_bh *user_heap = NULL;
 static rb_bh *away_heap = NULL;
-
-extern char current_uid[IDLEN];
+static char current_uid[IDLEN];
 
 struct Dictionary *nd_dict = NULL;
 
 enum
 {
 	D_LINED,
-	K_LINED,
-	G_LINED
+	K_LINED
 };
 
 rb_dlink_list dead_list;
@@ -121,6 +120,7 @@ init_client(void)
 	client_heap = rb_bh_create(sizeof(struct Client), CLIENT_HEAP_SIZE, "client_heap");
 	lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
 	pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
+	user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
 	away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
 
 	rb_event_addish("check_pings", check_pings, NULL, 30);
@@ -154,16 +154,15 @@ make_client(struct Client *from)
 	{
 		client_p->from = client_p;	/* 'from' of local client is self! */
 
-		localClient = (struct LocalUser *) rb_bh_alloc(lclient_heap);
+		localClient = rb_bh_alloc(lclient_heap);
 		SetMyConnect(client_p);
 		client_p->localClient = localClient;
 
 		client_p->localClient->lasttime = client_p->localClient->firsttime = rb_current_time();
 
 		client_p->localClient->F = NULL;
-		client_p->localClient->ctrlF = NULL;
 
-		client_p->preClient = (struct PreClient *) rb_bh_alloc(pclient_heap);
+		client_p->preClient = rb_bh_alloc(pclient_heap);
 
 		/* as good a place as any... */
 		rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
@@ -174,7 +173,7 @@ make_client(struct Client *from)
 		client_p->preClient = NULL;
 		client_p->from = from;	/* 'from' of local client is self! */
 	}
-	
+
 	SetUnknown(client_p);
 	strcpy(client_p->username, "unknown");
 
@@ -194,7 +193,8 @@ free_pre_client(struct Client *client_p)
 	blptr = client_p->preClient->dnsbl_listed;
 	if (blptr != NULL)
 		unref_blacklist(blptr);
-	abort_blacklist_queries(client_p);
+	s_assert(rb_dlink_list_length(&client_p->preClient->dnsbl_queries) == 0);
+
 	rb_bh_free(pclient_heap, client_p->preClient);
 	client_p->preClient = NULL;
 }
@@ -220,8 +220,11 @@ free_local_client(struct Client *client_p)
 		client_p->localClient->listener = 0;
 	}
 
-	if(client_p->localClient->F)
+	if(client_p->localClient->F != NULL)
+	{
+		del_from_cli_fd_hash(client_p);
 		rb_close(client_p->localClient->F);
+	}
 
 	if(client_p->localClient->passwd)
 	{
@@ -230,10 +233,19 @@ free_local_client(struct Client *client_p)
 		rb_free(client_p->localClient->passwd);
 	}
 
+	rb_free(client_p->localClient->auth_user);
 	rb_free(client_p->localClient->challenge);
 	rb_free(client_p->localClient->fullcaps);
 	rb_free(client_p->localClient->opername);
 	rb_free(client_p->localClient->mangledhost);
+	if (client_p->localClient->privset)
+		privilegeset_unref(client_p->localClient->privset);
+
+	if(IsSSL(client_p))
+	    ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
+	if(IsCapable(client_p, CAP_ZIP))
+	    ssld_decrement_clicount(client_p->localClient->z_ctl);
 
 	rb_bh_free(lclient_heap, client_p->localClient);
 	client_p->localClient = NULL;
@@ -246,6 +258,7 @@ free_client(struct Client *client_p)
 	s_assert(&me != client_p);
 	free_local_client(client_p);
 	free_pre_client(client_p);
+	rb_free(client_p->certfp);
 	rb_bh_free(client_heap, client_p);
 }
 
@@ -255,7 +268,7 @@ free_client(struct Client *client_p)
  *
  * inputs       - NOT USED (from event)
  * output       - next time_t when check_pings() should be called again
- * side effects - 
+ * side effects -
  *
  *
  * A PING can be sent to clients as necessary.
@@ -288,7 +301,7 @@ check_pings(void *notused)
  *
  * inputs	- pointer to list to check
  * output	- NONE
- * side effects	- 
+ * side effects	-
  */
 static void
 check_pings_list(rb_dlink_list * list)
@@ -320,7 +333,7 @@ check_pings_list(rb_dlink_list * list)
 				{
 					sendto_realops_snomask(SNO_GENERAL, L_ALL,
 							     "No response from %s, closing link",
-							     get_server_name(client_p, HIDE_IP));
+							     client_p->name);
 					ilog(L_SERVER,
 					     "No response from %s, closing link",
 					     log_client_name(client_p, HIDE_IP));
@@ -371,6 +384,11 @@ check_unknowns_list(rb_dlink_list * list)
 		if(IsDead(client_p) || IsClosing(client_p))
 			continue;
 
+		/* still has DNSbls to validate against */
+		if(client_p->preClient != NULL &&
+				rb_dlink_list_length(&client_p->preClient->dnsbl_queries) > 0)
+			continue;
+
 		/*
 		 * Check UNKNOWN connections - if they have been in this state
 		 * for > 30s, close them.
@@ -383,7 +401,7 @@ check_unknowns_list(rb_dlink_list * list)
 			{
 				sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
 						     "No response from %s, closing link",
-						     get_server_name(client_p, HIDE_IP));
+						     client_p->name);
 				ilog(L_SERVER,
 				     "No response from %s, closing link",
 				     log_client_name(client_p, HIDE_IP));
@@ -399,29 +417,17 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 	static const char conn_closed[] = "Connection closed";
 	static const char d_lined[] = "D-lined";
 	static const char k_lined[] = "K-lined";
-	static const char g_lined[] = "G-lined";
 	const char *reason = NULL;
 	const char *exit_reason = conn_closed;
 
-	if(ConfigFileEntry.kline_with_reason && !EmptyString(aconf->passwd))
+	if(ConfigFileEntry.kline_with_reason)
 	{
-		reason = aconf->passwd;
-		exit_reason = aconf->passwd;
+		reason = get_user_ban_reason(aconf);
+		exit_reason = reason;
 	}
 	else
 	{
-		switch (aconf->status)
-		{
-		case D_LINED:
-			reason = d_lined;
-			break;
-		case G_LINED:
-			reason = g_lined;
-			break;
-		default:
-			reason = k_lined;
-			break;
-		}
+		reason = aconf->status == D_LINED ? d_lined : k_lined;
 	}
 
 	if(ban == D_LINED && !IsPerson(client_p))
@@ -429,8 +435,8 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 	else
 		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
 			   me.name, client_p->name, reason);
-	
-	exit_client(client_p, client_p, &me, 
+
+	exit_client(client_p, client_p, &me,
 			EmptyString(ConfigFileEntry.kline_reason) ? exit_reason :
 			 ConfigFileEntry.kline_reason);
 }
@@ -439,117 +445,15 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
  * check_banned_lines
  * inputs	- NONE
  * output	- NONE
- * side effects - Check all connections for a pending k/d/gline against the
+ * side effects - Check all connections for a pending k/dline against the
  * 		  client, exit the client if found.
  */
 void
 check_banned_lines(void)
 {
-	struct Client *client_p;	/* current local client_p being examined */
-	struct ConfItem *aconf = NULL;
-	rb_dlink_node *ptr, *next_ptr;
-
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
-	{
-		client_p = ptr->data;
-
-		if(IsMe(client_p))
-			continue;
-
-		/* if there is a returned struct ConfItem then kill it */
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
-		{
-			if(aconf->status & CONF_EXEMPTDLINE)
-				continue;
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "DLINE active for %s",
-					     get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, D_LINED);
-			continue;	/* and go examine next fd/client_p */
-		}
-
-		if(!IsPerson(client_p))
-			continue;
-
-		if((aconf = find_kline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					"KLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-			notify_banned_client(client_p, aconf, K_LINED);
-			continue;
-		}
-		else if((aconf = find_gline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"GLINE over-ruled for %s, client is kline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			if(IsExemptGline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"GLINE over-ruled for %s, client is gline_exempt [%s@%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->user, aconf->host);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					"GLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, G_LINED);
-			continue;
-		}
-		else if((aconf = find_xline(client_p->info, 1)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						"XLINE over-ruled for %s, client is kline_exempt [%s]",
-						get_client_name(client_p, HIDE_IP),
-						aconf->name);
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL, "XLINE active for %s",
-					get_client_name(client_p, HIDE_IP));
-
-			(void) exit_client(client_p, client_p, &me, "Bad user info");
-			continue;
-		}
-	}
-
-	/* also check the unknowns list for new dlines */
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
-	{
-		client_p = ptr->data;
-
-		if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)))
-		{
-			if(aconf->status & CONF_EXEMPTDLINE)
-				continue;
-
-			notify_banned_client(client_p, aconf, D_LINED);
-		}
-	}
-
+	check_dlines();
+	check_klines();
+	check_xlines();
 }
 
 /* check_klines_event()
@@ -591,8 +495,9 @@ check_klines(void)
 			if(IsExemptKline(client_p))
 			{
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "KLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
+						     "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
+						     get_client_name(client_p, HIDE_IP),
+						     aconf->user, aconf->host);
 				continue;
 			}
 
@@ -606,55 +511,6 @@ check_klines(void)
 	}
 }
 
-/* check_glines()
- *
- * inputs       -
- * outputs      -
- * side effects - all clients will be checked for glines
- */
-void
-check_glines(void)
-{
-	struct Client *client_p;
-	struct ConfItem *aconf;
-	rb_dlink_node *ptr;
-	rb_dlink_node *next_ptr;
-
-	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
-	{
-		client_p = ptr->data;
-
-		if(IsMe(client_p) || !IsPerson(client_p))
-			continue;
-
-		if((aconf = find_gline(client_p)) != NULL)
-		{
-			if(IsExemptKline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "GLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
-				continue;
-			}
-
-			if(IsExemptGline(client_p))
-			{
-				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "GLINE over-ruled for %s, client is gline_exempt",
-						     get_client_name(client_p, HIDE_IP));
-				continue;
-			}
-
-			sendto_realops_snomask(SNO_GENERAL, L_ALL,
-					     "GLINE active for %s",
-					     get_client_name(client_p, HIDE_IP));
-
-			notify_banned_client(client_p, aconf, K_LINED);
-			continue;
-		}
-	}
-}
-
 /* check_dlines()
  *
  * inputs       -
@@ -731,8 +587,9 @@ check_xlines(void)
 			if(IsExemptKline(client_p))
 			{
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
-						     "XLINE over-ruled for %s, client is kline_exempt",
-						     get_client_name(client_p, HIDE_IP));
+						     "XLINE over-ruled for %s, client is kline_exempt [%s]",
+						     get_client_name(client_p, HIDE_IP),
+						     aconf->host);
 				continue;
 			}
 
@@ -745,12 +602,100 @@ check_xlines(void)
 	}
 }
 
+/* resv_nick_fnc
+ *
+ * inputs		- resv, reason, time
+ * outputs		- NONE
+ * side effects	- all local clients matching resv will be FNC'd
+ */
+void
+resv_nick_fnc(const char *mask, const char *reason, int temp_time)
+{
+	struct Client *client_p, *target_p;
+	rb_dlink_node *ptr;
+	rb_dlink_node *next_ptr;
+	char *nick;
+	char note[NICKLEN+10];
+
+	if (!ConfigFileEntry.resv_fnc)
+		return;
+
+	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+	{
+		client_p = ptr->data;
+
+		if(IsMe(client_p) || !IsPerson(client_p) || IsExemptResv(client_p))
+			continue;
+
+		/* Skip users that already have UID nicks. */
+		if(IsDigit(client_p->name[0]))
+			continue;
+
+		if(match_esc(mask, client_p->name))
+		{
+			nick = client_p->id;
+
+			/* Tell opers. */
+			sendto_realops_snomask(SNO_GENERAL, L_ALL,
+				"RESV forced nick change for %s!%s@%s to %s; nick matched [%s] (%s)",
+				client_p->name, client_p->username, client_p->host, nick, mask, reason);
+
+			sendto_realops_snomask(SNO_NCHANGE, L_ALL,
+				"Nick change: From %s to %s [%s@%s]",
+				client_p->name, nick, client_p->username, client_p->host);
+
+			/* Tell the user. */
+			if (temp_time > 0)
+			{
+				sendto_one_notice(client_p,
+					":*** Nick %s is temporarily unavailable on this server.",
+					client_p->name);
+			}
+			else
+			{
+				sendto_one_notice(client_p,
+					":*** Nick %s is no longer available on this server.",
+					client_p->name);
+			}
+
+			/* Do all of the nick-changing gymnastics. */
+			client_p->tsinfo = rb_current_time();
+			add_history(client_p, 1);
+
+			monitor_signoff(client_p);
+
+			invalidate_bancache_user(client_p);
+
+			sendto_common_channels_local(client_p, NOCAPS, ":%s!%s@%s NICK :%s",
+				client_p->name, client_p->username, client_p->host, nick);
+			sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
+				use_id(client_p), nick, (long) client_p->tsinfo);
+
+			del_from_client_hash(client_p->name, client_p);
+			rb_strlcpy(client_p->name, nick, sizeof(client_p->name));
+			add_to_client_hash(nick, client_p);
+
+			monitor_signon(client_p);
+
+			RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
+			{
+				target_p = ptr->data;
+				rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
+				rb_dlinkDestroy(ptr, &client_p->on_allow_list);
+			}
+
+			rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+			rb_note(client_p->localClient->F, note);
+		}
+	}
+}
+
 /*
  * update_client_exit_stats
  *
  * input	- pointer to client
  * output	- NONE
- * side effects	- 
+ * side effects	-
  */
 static void
 update_client_exit_stats(struct Client *client_p)
@@ -781,7 +726,7 @@ update_client_exit_stats(struct Client *client_p)
  *
  * input	- pointer to client to release
  * output	- NONE
- * side effects	- 
+ * side effects	-
  */
 static void
 release_client_state(struct Client *client_p)
@@ -862,8 +807,8 @@ find_named_person(const char *name)
 
 
 /*
- * find_chasing - find the client structure for a nick name (user) 
- *      using history mechanism if necessary. If the client is not found, 
+ * find_chasing - find the client structure for a nick name (user)
+ *      using history mechanism if necessary. If the client is not found,
  *      an error message (NO SUCH NICK) is generated. If the client was found
  *      through the history, chasing will be 1 and otherwise 0.
  */
@@ -927,20 +872,18 @@ get_client_name(struct Client *client, int showip)
 		if(!irccmp(client->name, client->host))
 			return client->name;
 
-		if(ConfigFileEntry.hide_spoof_ips && 
+		if(ConfigFileEntry.hide_spoof_ips &&
 		   showip == SHOW_IP && IsIPSpoof(client))
 			showip = MASK_IP;
-#ifdef HIDE_SERVERS_IPS
 		if(IsAnyServer(client))
 			showip = MASK_IP;
-#endif
 
 		/* And finally, let's get the host information, ip or name */
 		switch (showip)
 		{
 		case SHOW_IP:
-			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", 
-				   client->name, client->username, 
+			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+				   client->name, client->username,
 				   client->sockhost);
 			break;
 		case MASK_IP:
@@ -954,55 +897,12 @@ get_client_name(struct Client *client, int showip)
 		return nbuf;
 	}
 
-	/* As pointed out by Adel Mezibra 
+	/* As pointed out by Adel Mezibra
 	 * Neph|l|m@EFnet. Was missing a return here.
 	 */
 	return client->name;
 }
 
-const char *
-get_server_name(struct Client *target_p, int showip)
-{
-	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
-
-	if(target_p == NULL)
-		return NULL;
-
-	if(!MyConnect(target_p) || !irccmp(target_p->name, target_p->host))
-		return target_p->name;
-
-#ifdef HIDE_SERVERS_IPS
-	if(EmptyString(target_p->name))
-	{
-		rb_snprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]",
-				target_p->username);
-		return nbuf;
-	}
-	else
-		return target_p->name;
-#endif
-
-	switch (showip)
-	{
-		case SHOW_IP:
-			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
-				target_p->name, target_p->username, 
-				target_p->sockhost);
-			break;
-
-		case MASK_IP:
-			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
-				target_p->name, target_p->username);
-
-		default:
-			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
-				target_p->name, target_p->username,
-				target_p->host);
-	}
-
-	return nbuf;
-}
-	
 /* log_client_name()
  *
  * This version is the same as get_client_name, but doesnt contain the
@@ -1028,10 +928,6 @@ log_client_name(struct Client *target_p, int showip)
 				   target_p->username, target_p->sockhost);
 			break;
 
-		case MASK_IP:
-			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
-				   target_p->name, target_p->username);
-
 		default:
 			rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
 				   target_p->username, target_p->host);
@@ -1078,7 +974,7 @@ free_exited_clients(void *unused)
 				if(abt->client == target_p)
 				{
 					s_assert(0);
-					sendto_realops_snomask(SNO_GENERAL, L_ALL, 
+					sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"On abort_list: %s stat: %u flags: %u/%u handler: %c",
 						target_p->name, (unsigned int) target_p->status,
 						target_p->flags, target_p->flags2, target_p->handler);
@@ -1125,53 +1021,13 @@ free_exited_clients(void *unused)
 		rb_dlinkDestroy(ptr, &dead_remote_list);
 	}
 #endif
-	
-}
-
-/*
-** Recursively send QUITs and SQUITs for source_p and all its dependent clients
-** and servers to those servers that need them.  A server needs the client
-** QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
-** isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
-** a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
-** on that one -orabidoo
-*/
-static void
-recurse_send_quits(struct Client *client_p, struct Client *source_p, 
-		   struct Client *to, const char *comment1,
-		   const char *comment)
-{
-	struct Client *target_p;
-	rb_dlink_node *ptr, *ptr_next;
-	/* If this server can handle quit storm (QS) removal
-	 * of dependents, just send the SQUIT
-	 */
 
-	if(IsCapable(to, CAP_QS))
-	{
-		sendto_one(to, "SQUIT %s :%s",
-			   get_id(source_p, to), comment);
-	}
-	else
-	{
-		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
-		{
-			target_p = ptr->data;
-			sendto_one(to, ":%s QUIT :%s", target_p->name, comment1);
-		}
-		RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
-		{
-			target_p = ptr->data;
-			recurse_send_quits(client_p, target_p, to, comment1, comment);
-		}
-		sendto_one(to, "SQUIT %s :%s", source_p->name, comment);
-	}
 }
 
-/* 
+/*
 ** Remove all clients that depend on source_p; assumes all (S)QUITs have
-** already been sent.  we make sure to exit a server's dependent clients 
-** and servers before the server itself; exit_one_client takes care of 
+** already been sent.  we make sure to exit a server's dependent clients
+** and servers before the server itself; exit_one_client takes care of
 ** actually removing things off llists.   tweaked from +CSr31  -orabidoo
 */
 /*
@@ -1212,7 +1068,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 			if(!IsDead(target_p) && !IsClosing(target_p))
 				exit_remote_client(NULL, target_p, &me, comment);
 		}
-	}	
+	}
 
 	RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
 	{
@@ -1224,7 +1080,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 
 /*
 ** Remove *everything* that depends on source_p, from all lists, and sending
-** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
+** all necessary SQUITs.  source_p itself is still on the lists,
 ** and its SQUITs have been sent except for the upstream one  -orabidoo
 */
 static void
@@ -1239,11 +1095,10 @@ remove_dependents(struct Client *client_p,
 	{
 		to = ptr->data;
 
-		if(IsMe(to) || to == source_p->from || 
-		   (to == client_p && IsCapable(to, CAP_QS)))
+		if(IsMe(to) || to == source_p->from || to == client_p)
 			continue;
 
-		recurse_send_quits(client_p, source_p, to, comment1, comment);
+		sendto_one(to, "SQUIT %s :%s", get_id(source_p, to), comment);
 	}
 
 	recurse_remove_clients(source_p, comment1);
@@ -1263,7 +1118,7 @@ exit_aborted_clients(void *unused)
 			if(rb_dlinkFind(abt->client, &dead_list))
 			{
 				s_assert(0);
-				sendto_realops_snomask(SNO_GENERAL, L_ALL, 
+				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 					"On dead_list: %s stat: %u flags: %u/%u handler: %c",
 					abt->client->name, (unsigned int) abt->client->status,
 					abt->client->flags, abt->client->flags2, abt->client->handler);
@@ -1280,7 +1135,7 @@ exit_aborted_clients(void *unused)
  	 	if(IsAnyServer(abt->client))
  	 	 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
   	 	 	                     "Closing link to %s: %s",
-   	 	 	                     get_server_name(abt->client, HIDE_IP), abt->notice);
+   	 	 	                      abt->client->name, abt->notice);
 
 		/* its no longer on abort list - we *must* remove
 		 * FLAGS_CLOSING otherwise exit_client() will not run --fl
@@ -1297,7 +1152,7 @@ exit_aborted_clients(void *unused)
  *
  */
 void
-dead_link(struct Client *client_p)
+dead_link(struct Client *client_p, int sendqex)
 {
 	struct abort_client *abt;
 
@@ -1307,8 +1162,8 @@ dead_link(struct Client *client_p)
 
 	abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
-	if(client_p->flags & FLAGS_SENDQEX)
-		strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
+	if(sendqex)
+		rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
 	else
 		rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
 
@@ -1330,7 +1185,7 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
 	if(IsOper(source_p))
 		rb_dlinkFindDestroy(source_p, &oper_list);
 
-	sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
+	sendto_common_channels_local(source_p, NOCAPS, ":%s!%s@%s QUIT :%s",
 				     source_p->name,
 				     source_p->username, source_p->host, comment);
 
@@ -1361,7 +1216,7 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
 	remove_client_from_list(source_p);
 }
 
-/* 
+/*
  * Assumes IsPerson(source_p) && !MyConnect(source_p)
  */
 
@@ -1370,7 +1225,7 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
 		   const char *comment)
 {
 	exit_generic_client(client_p, source_p, from, comment);
-	
+
 	if(source_p->servptr && source_p->servptr->serv)
 	{
 		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
@@ -1380,8 +1235,6 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
 	{
 		sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
 			      ":%s QUIT :%s", use_id(source_p), comment);
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-			      ":%s QUIT :%s", source_p->name, comment);
 	}
 
 	SetDead(source_p);
@@ -1402,7 +1255,12 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 		  const char *comment)
 {
 	delete_auth_queries(source_p);
-	del_unknown_ip(source_p);
+	abort_blacklist_queries(source_p);
+	if (source_p->localClient->dnsquery)
+	{
+		delete_resolver_queries(source_p->localClient->dnsquery);
+		rb_free(source_p->localClient->dnsquery);
+	}
 	rb_dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
 	if(!IsIOError(source_p))
@@ -1426,13 +1284,13 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 }
 
 static int
-exit_remote_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+exit_remote_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 		  const char *comment)
 {
 	static char comment1[(HOSTLEN*2)+2];
 	static char newcomment[BUFSIZE];
 	struct Client *target_p;
-	
+
 	if(ConfigServerHide.flatten_links)
 		strcpy(comment1, "*.net *.split");
 	else
@@ -1455,11 +1313,11 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 
 	rb_dlinkFindDestroy(source_p, &global_serv_list);
 	target_p = source_p->from;
-	
+
 	if(target_p != NULL && IsServer(target_p) && target_p != client_p &&
 	   !IsMe(target_p) && (source_p->flags & FLAGS_KILLED) == 0)
 	{
-		sendto_one(target_p, ":%s SQUIT %s :%s", 
+		sendto_one(target_p, ":%s SQUIT %s :%s",
 			   get_id(from, target_p), get_id(source_p, target_p),
 			   comment);
 	}
@@ -1468,9 +1326,9 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 		del_from_id_hash(source_p->id, source_p);
 
 	del_from_client_hash(source_p->name, source_p);
-	remove_client_from_list(source_p);  
+	remove_client_from_list(source_p);
 	scache_split(source_p->serv->nameinfo);
-	
+
 	SetDead(source_p);
 #ifdef DEBUG_EXITED_CLIENTS
 	rb_dlinkAddAlloc(source_p, &dead_remote_list);
@@ -1481,43 +1339,39 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 }
 
 static int
-qs_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 		  const char *comment)
 {
-	struct Client *target_p;
-
 	if(source_p->servptr && source_p->servptr->serv)
 		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
 		s_assert(0);
 
 	rb_dlinkFindDestroy(source_p, &global_serv_list);
-	target_p = source_p->from;
-	
+
 	if(has_id(source_p))
 		del_from_id_hash(source_p->id, source_p);
 
 	del_from_client_hash(source_p->name, source_p);
-	remove_client_from_list(source_p);  
+	remove_client_from_list(source_p);
 	scache_split(source_p->serv->nameinfo);
-	
+
 	SetDead(source_p);
-	rb_dlinkAddAlloc(source_p, &dead_list);	
+	rb_dlinkAddAlloc(source_p, &dead_list);
 	return 0;
 }
 
 static int
-exit_local_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+exit_local_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 		  const char *comment)
 {
 	static char comment1[(HOSTLEN*2)+2];
 	static char newcomment[BUFSIZE];
 	unsigned int sendk, recvk;
-	
+
 	rb_dlinkDelete(&source_p->localClient->tnode, &serv_list);
 	rb_dlinkFindDestroy(source_p, &global_serv_list);
-	
-	unset_chcap_usage_counts(source_p);
+
 	sendk = source_p->localClient->sendK;
 	recvk = source_p->localClient->receiveK;
 
@@ -1534,7 +1388,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 		sendto_one(source_p, "ERROR :Closing Link: 127.0.0.1 %s (%s)",
 			   source_p->name, comment);
 	}
-	
+
 	if(source_p->servptr && source_p->servptr->serv)
 		rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
@@ -1542,7 +1396,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
 
 	close_connection(source_p);
-	
+
 	if(ConfigServerHide.flatten_links)
 		strcpy(comment1, "*.net *.split");
 	else
@@ -1561,21 +1415,21 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
 	ilog(L_SERVER, "%s was connected for %ld seconds.  %d/%d sendK/recvK.",
 	     source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
-        
+
 	if(has_id(source_p))
 		del_from_id_hash(source_p->id, source_p);
 
 	del_from_client_hash(source_p->name, source_p);
 	remove_client_from_list(source_p);
 	scache_split(source_p->serv->nameinfo);
-	
+
 	SetDead(source_p);
 	rb_dlinkAddAlloc(source_p, &dead_list);
 	return 0;
 }
 
 
-/* 
+/*
  * This assumes IsPerson(source_p) == TRUE && MyConnect(source_p) == TRUE
  */
 
@@ -1584,6 +1438,7 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 		  const char *comment)
 {
 	unsigned long on_for;
+	char tbuf[26];
 
 	exit_generic_client(client_p, source_p, from, comment);
 	clear_monitor(source_p);
@@ -1609,10 +1464,11 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 
 	on_for = rb_current_time() - source_p->localClient->firsttime;
 
-	ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
-		myctime(rb_current_time()), on_for / 3600,
+	ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %s %d/%d",
+		rb_ctime(rb_current_time(), tbuf, sizeof(tbuf)), on_for / 3600,
 		(on_for % 3600) / 60, on_for % 60,
 		source_p->name, source_p->username, source_p->host,
+		source_p->sockhost,
 		source_p->localClient->sendK, source_p->localClient->receiveK);
 
 	sendto_one(source_p, "ERROR :Closing Link: %s (%s)", source_p->host, comment);
@@ -1622,8 +1478,6 @@ exit_local_client(struct Client *client_p, struct Client *source_p, struct Clien
 	{
 		sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
 			      ":%s QUIT :%s", use_id(source_p), comment);
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-			      ":%s QUIT :%s", source_p->name, comment);
 	}
 
 	SetDead(source_p);
@@ -1691,8 +1545,8 @@ exit_client(struct Client *client_p,	/* The local client originating the
 		/* IsUnknown || IsConnecting || IsHandShake */
 		else if(!IsReject(source_p))
 			return exit_unknown_client(client_p, source_p, from, comment);
-	} 
-	else 
+	}
+	else
 	{
 		/* Remotes */
 		if(IsPerson(source_p))
@@ -1733,9 +1587,9 @@ count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 
 /*
  * accept processing, this adds a form of "caller ID" to ircd
- * 
+ *
  * If a client puts themselves into "caller ID only" mode,
- * only clients that match a client pointer they have put on 
+ * only clients that match a client pointer they have put on
  * the accept list will be allowed to message them.
  *
  * [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
@@ -1746,7 +1600,7 @@ count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
  * each source client then has a back pointer pointing back
  * to the client that has it on its accept list.
  * This allows for exit_one_client to remove these now bogus entries
- * from any client having an accept on them. 
+ * from any client having an accept on them.
  */
 /*
  * del_all_accepts
@@ -1786,12 +1640,12 @@ del_all_accepts(struct Client *client_p)
 }
 
 /*
- * show_ip() - asks if the true IP shoudl be shown when source is
- *             askin for info about target 
+ * show_ip() - asks if the true IP should be shown when source is
+ *             asking for info about target
  *
  * Inputs	- source_p who is asking
  *		- target_p who do we want the info on
- * Output	- returns 1 if clear IP can be showed, otherwise 0
+ * Output	- returns 1 if clear IP can be shown, otherwise 0
  * Side Effects	- none
  */
 
@@ -1800,10 +1654,6 @@ show_ip(struct Client *source_p, struct Client *target_p)
 {
 	if(IsAnyServer(target_p))
 	{
-#ifndef HIDE_SERVERS_IPS
-		if(source_p == NULL || IsOper(source_p))
-			return 1;
-#endif
 		return 0;
 	}
 	else if(IsIPSpoof(target_p))
@@ -1836,22 +1686,16 @@ show_ip_conf(struct ConfItem *aconf, struct Client *source_p)
 		return 1;
 }
 
-/*
- * initUser
- *
- * inputs	- none
- * outputs	- none
- *
- * side effects - Creates a block heap for struct Users
- *
- */
-static rb_bh *user_heap;
-void
-initUser(void)
+int
+show_ip_whowas(struct Whowas *whowas, struct Client *source_p)
 {
-	user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
-	if(!user_heap)
-		rb_outofmemory();
+	if(whowas->flags & WHOWAS_IP_SPOOFING)
+		if(ConfigFileEntry.hide_spoof_ips || !MyOper(source_p))
+			return 0;
+	if(whowas->flags & WHOWAS_DYNSPOOF)
+		if(!IsOper(source_p))
+			return 0;
+	return 1;
 }
 
 /*
@@ -1885,14 +1729,14 @@ make_user(struct Client *client_p)
  * side effects - add's an Server information block to a client
  *                if it was not previously allocated.
  */
-server_t *
+struct Server *
 make_server(struct Client *client_p)
 {
-	server_t *serv = client_p->serv;
+	struct Server *serv = client_p->serv;
 
 	if(!serv)
 	{
-		serv = (server_t *) rb_malloc(sizeof(server_t));
+		serv = (struct Server *) rb_malloc(sizeof(struct Server));
 		client_p->serv = serv;
 	}
 	return client_p->serv;
@@ -1900,7 +1744,7 @@ make_server(struct Client *client_p)
 
 /*
  * free_user
- * 
+ *
  * inputs	- pointer to user struct
  *		- pointer to client struct
  * output	- none
@@ -1930,7 +1774,7 @@ free_user(struct User *user, struct Client *client_p)
 					     client_p->host,
 					     (unsigned long) user,
 					     (unsigned long) user->invited.head,
-					     (unsigned long) user->channel.head, 
+					     (unsigned long) user->channel.head,
 					     rb_dlink_list_length(&user->channel),
 					     user->refcnt);
 			s_assert(!user->refcnt);
@@ -1946,7 +1790,7 @@ void
 allocate_away(struct Client *client_p)
 {
 	if(client_p->user->away == NULL)
-		client_p->user->away = rb_bh_alloc(away_heap);	
+		client_p->user->away = rb_bh_alloc(away_heap);
 }
 
 
@@ -2022,27 +1866,15 @@ close_connection(struct Client *client_p)
 	s_assert(MyConnect(client_p));
 	if(!MyConnect(client_p))
 		return;
-	
+
 	if(IsServer(client_p))
 	{
 		struct server_conf *server_p;
 
-		ServerStats->is_sv++;
-		ServerStats->is_sbs += client_p->localClient->sendB;
-		ServerStats->is_sbr += client_p->localClient->receiveB;
-		ServerStats->is_sks += client_p->localClient->sendK;
-		ServerStats->is_skr += client_p->localClient->receiveK;
-		ServerStats->is_sti += rb_current_time() - client_p->localClient->firsttime;
-		if(ServerStats->is_sbs > 2047)
-		{
-			ServerStats->is_sks += (ServerStats->is_sbs >> 10);
-			ServerStats->is_sbs &= 0x3ff;
-		}
-		if(ServerStats->is_sbr > 2047)
-		{
-			ServerStats->is_skr += (ServerStats->is_sbr >> 10);
-			ServerStats->is_sbr &= 0x3ff;
-		}
+		ServerStats.is_sv++;
+		ServerStats.is_sbs += client_p->localClient->sendB;
+		ServerStats.is_sbr += client_p->localClient->receiveB;
+		ServerStats.is_sti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
 
 		/*
 		 * If the connection has been up for a long amount of time, schedule
@@ -2065,42 +1897,25 @@ close_connection(struct Client *client_p)
 	}
 	else if(IsClient(client_p))
 	{
-		ServerStats->is_cl++;
-		ServerStats->is_cbs += client_p->localClient->sendB;
-		ServerStats->is_cbr += client_p->localClient->receiveB;
-		ServerStats->is_cks += client_p->localClient->sendK;
-		ServerStats->is_ckr += client_p->localClient->receiveK;
-		ServerStats->is_cti += rb_current_time() - client_p->localClient->firsttime;
-		if(ServerStats->is_cbs > 2047)
-		{
-			ServerStats->is_cks += (ServerStats->is_cbs >> 10);
-			ServerStats->is_cbs &= 0x3ff;
-		}
-		if(ServerStats->is_cbr > 2047)
-		{
-			ServerStats->is_ckr += (ServerStats->is_cbr >> 10);
-			ServerStats->is_cbr &= 0x3ff;
-		}
+		ServerStats.is_cl++;
+		ServerStats.is_cbs += client_p->localClient->sendB;
+		ServerStats.is_cbr += client_p->localClient->receiveB;
+		ServerStats.is_cti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
 	}
 	else
-		ServerStats->is_ni++;
+		ServerStats.is_ni++;
 
-	if(client_p->localClient->F)
+	if(client_p->localClient->F != NULL)
 	{
 		/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
 		if(!IsIOError(client_p))
 			send_queued(client_p);
 
+		del_from_cli_fd_hash(client_p);
 		rb_close(client_p->localClient->F);
 		client_p->localClient->F = NULL;
 	}
 
-	if(client_p->localClient->ctrlF)
-	{
-		rb_close(client_p->localClient->ctrlF);
-		client_p->localClient->ctrlF = NULL;
-	}
-
 	rb_linebuf_donebuf(&client_p->localClient->buf_sendq);
 	rb_linebuf_donebuf(&client_p->localClient->buf_recvq);
 	detach_conf(client_p);
@@ -2138,7 +1953,7 @@ error_exit_client(struct Client *client_p, int error)
 		{
 			sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
 					     "Server %s closed the connection",
-					     get_server_name(client_p, SHOW_IP));
+					     client_p->name);
 
 			ilog(L_SERVER, "Server %s closed the connection",
 			     log_client_name(client_p, SHOW_IP));
@@ -2154,7 +1969,7 @@ error_exit_client(struct Client *client_p, int error)
 	}
 
 	if(error == 0)
-		strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
+		rb_strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
 	else
 		rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));