X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/428ca87b01ad6c0487b424ce478f775cb7d94519..6485005214c12ef94a50096e96478804b9cef556:/modules/m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index 63f9dc1f..49588aa1 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -20,14 +20,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_stats.c 1608 2006-06-04 02:11:40Z jilles $
  */
 
 #include "stdinc.h"
 #include "class.h"		/* report_classes */
 #include "client.h"		/* Client */
-#include "common.h"		/* TRUE/FALSE */
 #include "match.h"
 #include "ircd.h"		/* me */
 #include "listener.h"		/* show_ports */
@@ -40,7 +37,6 @@
 #include "s_serv.h"		/* hunt_server */
 #include "s_stats.h"
 #include "s_user.h"		/* show_opers */
-#include "blacklist.h"		/* dnsbl stuff */
 #include "parse.h"
 #include "modules.h"
 #include "hook.h"
@@ -48,13 +44,17 @@
 #include "hash.h"
 #include "reject.h"
 #include "whowas.h"
-#include "irc_radixtree.h"
+#include "rb_radixtree.h"
 #include "sslproc.h"
+#include "s_assert.h"
+
+static const char stats_desc[] =
+	"Provides the STATS command to inspect various server/network information";
 
-static int m_stats (struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_stats (struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message stats_msgtab = {
-	"STATS", 0, 0, 0, MFLG_SLOW,
+	"STATS", false, false, false, false,
 	{mg_unreg, {m_stats, 2}, {m_stats, 3}, mg_ignore, mg_ignore, {m_stats, 2}}
 };
 
@@ -68,25 +68,31 @@ mapi_hlist_av1 stats_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(stats, NULL, NULL, stats_clist, stats_hlist, NULL, "$Revision: 1608 $");
+DECLARE_MODULE_AV2(stats, NULL, NULL, stats_clist, stats_hlist, NULL, NULL, NULL, stats_desc);
 
 const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
 
-static void stats_l_list(struct Client *s, const char *, int, int, rb_dlink_list *, char,
-				int (*check_fn)(struct Client *target_p));
+static void stats_l_list(struct Client *s, const char *, bool, bool, rb_dlink_list *, char,
+				bool (*check_fn)(struct Client *source_p, struct Client *target_p));
 static void stats_l_client(struct Client *source_p, struct Client *target_p,
 				char statchar);
 
 static int stats_spy(struct Client *, char, const char *);
 static void stats_p_spy(struct Client *);
 
-/* Heres our struct for the stats table */
-struct StatsStruct
+typedef void (*handler_t)(struct Client *source_p);
+typedef void (*handler_parv_t)(struct Client *source_p, int parc, const char *parv[]);
+
+struct stats_cmd
 {
-	char letter;
-	void (*handler) (struct Client *source_p);
-	int need_oper;
-	int need_admin;
+	union
+	{
+		handler_t handler;
+		handler_parv_t handler_parv;
+	};
+	const char *need_priv;
+	bool need_parv;
+	bool need_admin;
 };
 
 static void stats_dns_servers(struct Client *);
@@ -98,7 +104,6 @@ static void stats_deny(struct Client *);
 static void stats_exempt(struct Client *);
 static void stats_events(struct Client *);
 static void stats_prop_klines(struct Client *);
-static void stats_hubleaf(struct Client *);
 static void stats_auth(struct Client *);
 static void stats_tklines(struct Client *);
 static void stats_klines(struct Client *);
@@ -110,11 +115,11 @@ static void stats_operedup(struct Client *);
 static void stats_ports(struct Client *);
 static void stats_tresv(struct Client *);
 static void stats_resv(struct Client *);
+static void stats_secure(struct Client *);
 static void stats_ssld(struct Client *);
 static void stats_usage(struct Client *);
 static void stats_tstats(struct Client *);
 static void stats_uptime(struct Client *);
-static void stats_shared(struct Client *);
 static void stats_servers(struct Client *);
 static void stats_tgecos(struct Client *);
 static void stats_gecos(struct Client *);
@@ -126,81 +131,86 @@ static void stats_ziplinks(struct Client *);
 static void stats_comm(struct Client *);
 static void stats_capability(struct Client *);
 
+#define HANDLER_NORM(fn, admin, priv) \
+		{ { .handler = fn }, .need_parv = false, .need_priv = priv, .need_admin = admin }
+#define HANDLER_PARV(fn, admin, priv) \
+		{ { .handler_parv = fn }, .need_parv = true, .need_priv = priv, .need_admin = admin }
+
 /* This table contains the possible stats items, in order:
- * stats letter,  function to call, operonly? adminonly?
- * case only matters in the stats letter column.. -- fl_
+ * stats letter,  function to call, operonly? adminonly? --fl_
+ *
+ * Previously in this table letters were a column. I fixed it to use modern
+ * C initalisers so we don't have to iterate anymore
+ * --Elizafox
  */
-static struct StatsStruct stats_cmd_table[] = {
-    /* letter     function        need_oper need_admin */
-	{'a', stats_dns_servers,	1, 1, },
-	{'A', stats_dns_servers,	1, 1, },
-	{'b', stats_delay,		1, 1, },
-	{'B', stats_hash,		1, 1, },
-	{'c', stats_connect,		0, 0, },
-	{'C', stats_capability,		1, 0, },
-	{'d', stats_tdeny,		1, 0, },
-	{'D', stats_deny,		1, 0, },
-	{'e', stats_exempt,		1, 0, },
-	{'E', stats_events,		1, 1, },
-	{'f', stats_comm,		1, 1, },
-	{'F', stats_comm,		1, 1, },
-	{'g', stats_prop_klines,	1, 0, },
-	{'h', stats_hubleaf,		0, 0, },
-	{'H', stats_hubleaf,		0, 0, },
-	{'i', stats_auth,		0, 0, },
-	{'I', stats_auth,		0, 0, },
-	{'k', stats_tklines,		0, 0, },
-	{'K', stats_klines,		0, 0, },
-	{'l', NULL /* special */,	0, 0, },
-	{'L', NULL /* special */,	0, 0, },
-	{'m', stats_messages,		0, 0, },
-	{'M', stats_messages,		0, 0, },
-	{'n', stats_dnsbl,		0, 0, },
-	{'o', stats_oper,		0, 0, },
-	{'O', stats_privset,		1, 0, },
-	{'p', stats_operedup,		0, 0, },
-	{'P', stats_ports,		0, 0, },
-	{'q', stats_tresv,		1, 0, },
-	{'Q', stats_resv,		1, 0, },
-	{'r', stats_usage,		1, 0, },
-	{'R', stats_usage,		1, 0, },
-	{'s', stats_ssld,		1, 1, },
-	{'S', stats_ssld,		1, 1, },
-	{'t', stats_tstats,		1, 0, },
-	{'T', stats_tstats,		1, 0, },
-	{'u', stats_uptime,		0, 0, },
-	{'U', stats_shared,		1, 0, },
-	{'v', stats_servers,		0, 0, },
-	{'V', stats_servers,		0, 0, },
-	{'x', stats_tgecos,		1, 0, },
-	{'X', stats_gecos,		1, 0, },
-	{'y', stats_class,		0, 0, },
-	{'Y', stats_class,		0, 0, },
-	{'z', stats_memory,		1, 0, },
-	{'Z', stats_ziplinks,		1, 0, },
-	{'?', stats_servlinks,		0, 0, },
-	{(char) 0, (void (*)()) 0, 	0, 0, }
+static struct stats_cmd stats_cmd_table[256] = {
+/*	letter               handler		admin	priv */
+	['a'] = HANDLER_NORM(stats_dns_servers,	true,	NULL),
+	['A'] = HANDLER_NORM(stats_dns_servers,	true,	NULL),
+	['b'] = HANDLER_NORM(stats_delay,	true,	NULL),
+	['B'] = HANDLER_NORM(stats_hash,	true,	NULL),
+	['c'] = HANDLER_NORM(stats_connect,	false,	NULL),
+	['C'] = HANDLER_NORM(stats_capability,	false,	"oper:general"),
+	['d'] = HANDLER_NORM(stats_tdeny,	false,	"oper:general"),
+	['D'] = HANDLER_NORM(stats_deny,	false,	"oper:general"),
+	['e'] = HANDLER_NORM(stats_exempt,	false,	"oper:general"),
+	['E'] = HANDLER_NORM(stats_events,	true,	NULL),
+	['f'] = HANDLER_NORM(stats_comm,	true,	NULL),
+	['F'] = HANDLER_NORM(stats_comm,	true,	NULL),
+	['g'] = HANDLER_NORM(stats_prop_klines,	false,	"oper:general"),
+	['i'] = HANDLER_NORM(stats_auth,	false,	NULL),
+	['I'] = HANDLER_NORM(stats_auth,	false,	NULL),
+	['k'] = HANDLER_NORM(stats_tklines,	false,	NULL),
+	['K'] = HANDLER_NORM(stats_klines,	false,	NULL),
+	['l'] = HANDLER_PARV(stats_ltrace,	false,	NULL),
+	['L'] = HANDLER_PARV(stats_ltrace,	false,	NULL),
+	['m'] = HANDLER_NORM(stats_messages,	false,	NULL),
+	['M'] = HANDLER_NORM(stats_messages,	false,	NULL),
+	['n'] = HANDLER_NORM(stats_dnsbl,	false,	NULL),
+	['o'] = HANDLER_NORM(stats_oper,	false,	NULL),
+	['O'] = HANDLER_NORM(stats_privset,	false,	"oper:privs"),
+	['p'] = HANDLER_NORM(stats_operedup,	false,	NULL),
+	['P'] = HANDLER_NORM(stats_ports,	false,	NULL),
+	['q'] = HANDLER_NORM(stats_tresv,	false,	"oper:general"),
+	['Q'] = HANDLER_NORM(stats_resv,	false,	"oper:general"),
+	['r'] = HANDLER_NORM(stats_usage,	false,	"oper:general"),
+	['R'] = HANDLER_NORM(stats_usage,	false,	"oper:general"),
+	['s'] = HANDLER_NORM(stats_secure,	false,	"oper:general"),
+	['S'] = HANDLER_NORM(stats_ssld,	true,	NULL),
+	['t'] = HANDLER_NORM(stats_tstats,	false,	"oper:general"),
+	['T'] = HANDLER_NORM(stats_tstats,	false,	"oper:general"),
+	['u'] = HANDLER_NORM(stats_uptime,	false,	NULL),
+	['v'] = HANDLER_NORM(stats_servers,	false,	NULL),
+	['V'] = HANDLER_NORM(stats_servers,	false,	NULL),
+	['x'] = HANDLER_NORM(stats_tgecos,	false,	"oper:general"),
+	['X'] = HANDLER_NORM(stats_gecos,	false,	"oper:general"),
+	['y'] = HANDLER_NORM(stats_class,	false,	NULL),
+	['Y'] = HANDLER_NORM(stats_class,	false,	NULL),
+	['z'] = HANDLER_NORM(stats_memory,	false,	"oper:general"),
+	['Z'] = HANDLER_NORM(stats_ziplinks,	false,	"oper:general"),
+	['?'] = HANDLER_NORM(stats_servlinks,	false,	NULL),
 };
 
 /*
  * m_stats by fl_
+ * Modified heavily by Elizafox
  *      parv[1] = stat letter/command
  *      parv[2] = (if present) server/mask in stats L, or target
  *
  * This will search the tables for the appropriate stats letter,
  * if found execute it.
  */
-static int
+static void
 m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static time_t last_used = 0;
-	int i;
-	char statchar;
+	struct stats_cmd *cmd;
+	unsigned char statchar;
 	int did_stats = 0;
 
 	statchar = parv[1][0];
 
-	if(MyClient(source_p) && !IsOper(source_p))
+	if(MyClient(source_p) && !IsOperGeneral(source_p) && parc > 2)
 	{
 		/* Check the user is actually allowed to do /stats, and isnt flooding */
 		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
@@ -210,72 +220,81 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 				   me.name, source_p->name, "STATS");
 			sendto_one_numeric(source_p, RPL_ENDOFSTATS,
 					   form_str(RPL_ENDOFSTATS), statchar);
-			return 0;
+			return;
 		}
 		else
 			last_used = rb_current_time();
 	}
 
-	if(hunt_server (client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
-		return 0;
+	if(hunt_server(client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
+		return;
 
-	if((statchar != 'L') && (statchar != 'l'))
+	if(tolower(statchar) != 'l')
+		/* FIXME */
 		did_stats = stats_spy(source_p, statchar, NULL);
 
 	/* if did_stats is true, a module grabbed this STATS request */
-	if (did_stats)
+	if(did_stats)
 		goto stats_out;
 
-	for (i = 0; stats_cmd_table[i].letter; i++)
+	/* Look up */
+	cmd = &stats_cmd_table[statchar];
+	if(cmd->handler != NULL)
 	{
-		if(stats_cmd_table[i].letter == statchar)
+		/* The stats table says what privs are needed, so check --fl_ */
+		const char *missing_priv = NULL;
+		if(cmd->need_admin && !IsOperAdmin(source_p))
+			missing_priv = "admin";
+		else if(cmd->need_priv && !HasPrivilege(source_p, cmd->need_priv))
+			missing_priv = cmd->need_priv;
+
+		if(missing_priv != NULL)
 		{
-			/* The stats table says what privs are needed, so check --fl_ */
-			/* Called for remote clients and for local opers, so check need_admin
-			 * and need_oper
-			 */
-			if(stats_cmd_table[i].need_oper && !IsOper(source_p))
+			if(!IsOper(source_p))
 			{
 				sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-						   form_str (ERR_NOPRIVILEGES));
-				break;
+					form_str(ERR_NOPRIVILEGES));
 			}
-			if(stats_cmd_table[i].need_admin && !IsOperAdmin(source_p))
+			else
 			{
+				if(!strncmp(missing_priv, "oper:", 5))
+					missing_priv += 5;
 				sendto_one(source_p, form_str(ERR_NOPRIVS),
-					   me.name, source_p->name, "admin");
-				break;
+					me.name, source_p->name, missing_priv);
 			}
-
-			/* Blah, stats L needs the parameters, none of the others do.. */
-			if(statchar == 'L' || statchar == 'l')
-				stats_ltrace (source_p, parc, parv);
-			else
-				stats_cmd_table[i].handler (source_p);
+			goto stats_out;
 		}
+
+		if(cmd->need_parv)
+			cmd->handler_parv(source_p, parc, parv);
+		else
+			cmd->handler(source_p);
 	}
 
 stats_out:
 	/* Send the end of stats notice, and the stats_spy */
 	sendto_one_numeric(source_p, RPL_ENDOFSTATS,
 			   form_str(RPL_ENDOFSTATS), statchar);
-
-	return 0;
 }
 
 static void
 stats_dns_servers (struct Client *source_p)
 {
-	report_dns_servers (source_p);
+	rb_dlink_node *n;
+
+	RB_DLINK_FOREACH(n, nameservers.head)
+	{
+		sendto_one_numeric(source_p, RPL_STATSDEBUG, "A :%s", (char *)n->data);
+	}
 }
 
 static void
 stats_delay(struct Client *source_p)
 {
 	struct nd_entry *nd;
-	struct DictionaryIter iter;
+	rb_dictionary_iter iter;
 
-	DICTIONARY_FOREACH(nd, &iter, nd_dict)
+	RB_DICTIONARY_FOREACH(nd, &iter, nd_dict)
 	{
 		sendto_one_notice(source_p, ":Delaying: %s for %ld",
 				nd->name, (long) nd->expire);
@@ -294,21 +313,21 @@ stats_hash(struct Client *source_p)
 	sendto_one_numeric(source_p, RPL_STATSDEBUG, "B :%-30s %-15s %-10s %-10s %-10s %-10s",
 		"NAME", "TYPE", "OBJECTS", "DEPTH SUM", "AVG DEPTH", "MAX DEPTH");
 
-	irc_dictionary_stats_walk(stats_hash_cb, source_p);
-	irc_radixtree_stats_walk(stats_hash_cb, source_p);
+	rb_dictionary_stats_walk(stats_hash_cb, source_p);
+	rb_radixtree_stats_walk(stats_hash_cb, source_p);
 }
 
 static void
 stats_connect(struct Client *source_p)
 {
-	static char buf[5];
+	static char buf[BUFSIZE];
 	struct server_conf *server_p;
 	char *s;
 	rb_dlink_node *ptr;
 
 	if((ConfigFileEntry.stats_c_oper_only ||
 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
-	    !IsOper(source_p))
+	    !IsOperGeneral(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str(ERR_NOPRIVILEGES));
@@ -324,10 +343,12 @@ stats_connect(struct Client *source_p)
 
 		s = buf;
 
-		if(IsOper(source_p))
+		if(IsOperGeneral(source_p))
 		{
 			if(ServerConfAutoconn(server_p))
 				*s++ = 'A';
+			if(ServerConfSCTP(server_p))
+				*s++ = 'M';
 			if(ServerConfSSL(server_p))
 				*s++ = 'S';
 			if(ServerConfTb(server_p))
@@ -345,7 +366,8 @@ stats_connect(struct Client *source_p)
 				form_str(RPL_STATSCLINE),
 				"*@127.0.0.1",
 				buf, server_p->name,
-				server_p->port, server_p->class_name);
+				server_p->port, server_p->class_name,
+				server_p->certfp ? server_p->certfp : "*");
 	}
 }
 
@@ -461,7 +483,8 @@ stats_exempt(struct Client *source_p)
 						   'e', host, pass, "", "");
 			}
 		}
-	}}
+	}
+}
 
 
 static void
@@ -502,47 +525,16 @@ stats_prop_klines(struct Client *source_p)
 	}
 }
 
-static void
-stats_hubleaf(struct Client *source_p)
-{
-	struct remote_conf *hub_p;
-	rb_dlink_node *ptr;
-
-	if((ConfigFileEntry.stats_h_oper_only ||
-	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
-	    !IsOper(source_p))
-	{
-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-				   form_str (ERR_NOPRIVILEGES));
-		return;
-	}
-
-	RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
-	{
-		hub_p = ptr->data;
-
-		if(hub_p->flags & CONF_HUB)
-			sendto_one_numeric(source_p, RPL_STATSHLINE,
-					form_str(RPL_STATSHLINE),
-					hub_p->host, hub_p->server);
-		else
-			sendto_one_numeric(source_p, RPL_STATSLLINE,
-					form_str(RPL_STATSLLINE),
-					hub_p->host, hub_p->server);
-	}
-}
-
-
 static void
 stats_auth (struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching auth blocks */
-	else if((ConfigFileEntry.stats_i_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_i_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *name, *host, *user, *classname;
@@ -553,7 +545,7 @@ stats_auth (struct Client *source_p)
 			aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
 						      (struct sockaddr *)&source_p->localClient->ip,
 						      CONF_CLIENT,
-						      source_p->localClient->ip.ss_family,
+						      GET_SS_FAMILY(&source_p->localClient->ip),
 						      source_p->username, NULL);
 		else
 			aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_CLIENT,
@@ -581,12 +573,12 @@ static void
 stats_tklines(struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching klines */
-	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *host, *pass, *user, *oper_reason;
@@ -595,7 +587,7 @@ stats_tklines(struct Client *source_p)
 			aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
 						      (struct sockaddr *)&source_p->localClient->ip,
 						      CONF_KILL,
-						      source_p->localClient->ip.ss_family,
+						      GET_SS_FAMILY(&source_p->localClient->ip),
 						      source_p->username, NULL);
 		else
 			aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL,
@@ -611,7 +603,7 @@ stats_tklines(struct Client *source_p)
 		get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
 
 		sendto_one_numeric(source_p, RPL_STATSKLINE,
-				   form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+				   form_str(RPL_STATSKLINE), (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				   host, user, pass, oper_reason ? "|" : "",
 				   oper_reason ? oper_reason : "");
 	}
@@ -683,12 +675,12 @@ static void
 stats_klines(struct Client *source_p)
 {
 	/* Oper only, if unopered, return ERR_NOPRIVS */
-	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOperGeneral (source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 
 	/* If unopered, Only return matching klines */
-	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper (source_p))
+	else if((ConfigFileEntry.stats_k_oper_only == 1) && !IsOperGeneral (source_p))
 	{
 		struct ConfItem *aconf;
 		char *host, *pass, *user, *oper_reason;
@@ -698,7 +690,7 @@ stats_klines(struct Client *source_p)
 			aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
 						      (struct sockaddr *)&source_p->localClient->ip,
 						      CONF_KILL,
-						      source_p->localClient->ip.ss_family,
+						      GET_SS_FAMILY(&source_p->localClient->ip),
 						      source_p->username, NULL);
 		else
 			aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL,
@@ -710,7 +702,7 @@ stats_klines(struct Client *source_p)
 		get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
 
 		sendto_one_numeric(source_p, RPL_STATSKLINE, form_str(RPL_STATSKLINE),
-				   aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+				   (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				   host, user, pass, oper_reason ? "|" : "",
 				   oper_reason ? oper_reason : "");
 	}
@@ -722,25 +714,33 @@ stats_klines(struct Client *source_p)
 static void
 stats_messages(struct Client *source_p)
 {
-	report_messages(source_p);
+	rb_dictionary_iter iter;
+	struct Message *msg;
+
+	RB_DICTIONARY_FOREACH(msg, &iter, cmd_dict)
+	{
+		s_assert(msg->cmd != NULL);
+		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
+				   form_str(RPL_STATSCOMMANDS),
+				   msg->cmd, msg->count,
+				   msg->bytes, msg->rcount);
+	}
 }
 
 static void
 stats_dnsbl(struct Client *source_p)
 {
-	rb_dlink_node *ptr;
-	struct Blacklist *blptr;
+	rb_dictionary_iter iter;
+	struct DNSBLEntryStats *stats;
 
-	RB_DLINK_FOREACH(ptr, blacklist_list.head)
-	{
-		blptr = ptr->data;
+	if(dnsbl_stats == NULL)
+		return;
 
+	RB_DICTIONARY_FOREACH(stats, &iter, dnsbl_stats)
+	{
 		/* use RPL_STATSDEBUG for now -- jilles */
-		sendto_one_numeric(source_p, RPL_STATSDEBUG, "n :%d %s %s (%d)",
-				blptr->hits,
-				blptr->host,
-				blptr->status & CONF_ILLEGAL ? "disabled" : "active",
-				blptr->refcount);
+		sendto_one_numeric(source_p, RPL_STATSDEBUG, "n :%d %s",
+				stats->hits, (const char *)iter.cur->key);
 	}
 }
 
@@ -750,7 +750,7 @@ stats_oper(struct Client *source_p)
 	struct oper_conf *oper_p;
 	rb_dlink_node *ptr;
 
-	if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
+	if(!IsOperGeneral(source_p) && ConfigFileEntry.stats_o_oper_only)
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
@@ -764,7 +764,7 @@ stats_oper(struct Client *source_p)
 		sendto_one_numeric(source_p, RPL_STATSOLINE,
 				form_str(RPL_STATSOLINE),
 				oper_p->username, oper_p->host, oper_p->name,
-				IsOper(source_p) ? oper_p->privset->name : "0", "-1");
+				HasPrivilege(source_p, "oper:privs") ? oper_p->privset->name : "0", "-1");
 	}
 }
 
@@ -805,7 +805,7 @@ stats_operedup (struct Client *source_p)
 	{
 		target_p = oper_ptr->data;
 
-		if(IsOperInvis(target_p) && !IsOper(source_p))
+		if(!SeesOper(target_p, source_p))
 			continue;
 
 		if(target_p->user->away)
@@ -828,7 +828,7 @@ stats_operedup (struct Client *source_p)
 static void
 stats_ports (struct Client *source_p)
 {
-	if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
+	if(!IsOperGeneral (source_p) && ConfigFileEntry.stats_P_oper_only)
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 	else
@@ -839,9 +839,8 @@ static void
 stats_tresv(struct Client *source_p)
 {
 	struct ConfItem *aconf;
-	struct irc_radixtree_iteration_state state;
+	rb_radixtree_iteration_state state;
 	rb_dlink_node *ptr;
-	int i;
 
 	RB_DLINK_FOREACH(ptr, resv_conf_list.head)
 	{
@@ -852,7 +851,7 @@ stats_tresv(struct Client *source_p)
 					'q', aconf->port, aconf->host, aconf->passwd);
 	}
 
-	IRC_RADIXTREE_FOREACH(aconf, &state, resv_tree)
+	RB_RADIXTREE_FOREACH(aconf, &state, resv_tree)
 	{
 		if(aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE,
@@ -866,9 +865,8 @@ static void
 stats_resv(struct Client *source_p)
 {
 	struct ConfItem *aconf;
-	struct irc_radixtree_iteration_state state;
+	rb_radixtree_iteration_state state;
 	rb_dlink_node *ptr;
-	int i;
 
 	RB_DLINK_FOREACH(ptr, resv_conf_list.head)
 	{
@@ -879,7 +877,7 @@ stats_resv(struct Client *source_p)
 					'Q', aconf->port, aconf->host, aconf->passwd);
 	}
 
-	IRC_RADIXTREE_FOREACH(aconf, &state, resv_tree)
+	RB_RADIXTREE_FOREACH(aconf, &state, resv_tree)
 	{
 		if(!aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE,
@@ -889,28 +887,48 @@ stats_resv(struct Client *source_p)
 }
 
 static void
-stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status)
+stats_secure(struct Client *source_p)
+{
+	struct AddressRec *arec;
+	struct ConfItem *aconf;
+	size_t i;
+
+	for (i = 0; i < ATABLE_SIZE; i++)
+	{
+		for (arec = atable[i]; arec; arec = arec->next)
+		{
+			if(arec->type == CONF_SECURE)
+			{
+				aconf = arec->aconf;
+				sendto_one_numeric(source_p, RPL_STATSDEBUG, "s :%s", aconf->host);
+			}
+		}
+	}
+}
+
+static void
+stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status, const char *version)
 {
 	struct Client *source_p = data;
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			"S :%u %c %u",
+			"S :%u %c %u :%s",
 			pid,
 			status == SSLD_DEAD ? 'D' : (status == SSLD_SHUTDOWN ? 'S' : 'A'),
-			cli_count);
+			cli_count,
+			version);
 }
 
 static void
 stats_ssld(struct Client *source_p)
 {
-#if 0
 	ssld_foreach_info(stats_ssld_foreach, source_p);
-#endif
 }
 
 static void
 stats_usage (struct Client *source_p)
 {
+#ifndef _WIN32
 	struct rusage rus;
 	time_t secs;
 	time_t rup;
@@ -962,6 +980,7 @@ stats_usage (struct Client *source_p)
 			   "R :Signals %d Context Vol. %d Invol %d",
 			   (int) rus.ru_nsignals, (int) rus.ru_nvcsw,
 			   (int) rus.ru_nivcsw);
+#endif
 }
 
 static void
@@ -1062,85 +1081,6 @@ stats_uptime (struct Client *source_p)
 			   Count.totalrestartcount);
 }
 
-struct shared_flags
-{
-	int flag;
-	char letter;
-};
-static struct shared_flags shared_flagtable[] =
-{
-	{ SHARED_PKLINE,	'K' },
-	{ SHARED_TKLINE,	'k' },
-	{ SHARED_UNKLINE,	'U' },
-	{ SHARED_PXLINE,	'X' },
-	{ SHARED_TXLINE,	'x' },
-	{ SHARED_UNXLINE,	'Y' },
-	{ SHARED_PRESV,		'Q' },
-	{ SHARED_TRESV,		'q' },
-	{ SHARED_UNRESV,	'R' },
-	{ SHARED_LOCOPS,	'L' },
-	{ SHARED_REHASH,	'H' },
-	{ SHARED_TDLINE,	'd' },
-	{ SHARED_PDLINE,	'D' },
-	{ SHARED_UNDLINE,	'E' },
-	{ SHARED_GRANT,		'G' },
-	{ SHARED_DIE,		'I' },
-	{ 0,			'\0'}
-};
-
-
-static void
-stats_shared (struct Client *source_p)
-{
-	struct remote_conf *shared_p;
-	rb_dlink_node *ptr;
-	char buf[sizeof(shared_flagtable)/sizeof(shared_flagtable[0])];
-	char *p;
-	int i;
-
-	RB_DLINK_FOREACH(ptr, shared_conf_list.head)
-	{
-		shared_p = ptr->data;
-
-		p = buf;
-
-		*p++ = 'c';
-
-		for(i = 0; shared_flagtable[i].flag != 0; i++)
-		{
-			if(shared_p->flags & shared_flagtable[i].flag)
-				*p++ = shared_flagtable[i].letter;
-		}
-
-		*p = '\0';
-
-		sendto_one_numeric(source_p, RPL_STATSULINE,
-					form_str(RPL_STATSULINE),
-					shared_p->server, shared_p->username,
-					shared_p->host, buf);
-	}
-
-	RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
-	{
-		shared_p = ptr->data;
-
-		p = buf;
-
-		*p++ = 'C';
-
-		for(i = 0; shared_flagtable[i].flag != 0; i++)
-		{
-			if(shared_p->flags & shared_flagtable[i].flag)
-				*p++ = shared_flagtable[i].letter;
-		}
-
-		*p = '\0';
-
-		sendto_one_numeric(source_p, RPL_STATSULINE,
-					form_str(RPL_STATSULINE),
-					shared_p->server, "*", "*", buf);
-	}
-}
 
 /* stats_servers()
  *
@@ -1157,7 +1097,7 @@ stats_servers (struct Client *source_p)
 	int days, hours, minutes;
 	int j = 0;
 
-	if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
+	if(ConfigServerHide.flatten_links && !IsOperGeneral(source_p) &&
 	   !IsExemptShide(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
@@ -1233,7 +1173,7 @@ stats_gecos(struct Client *source_p)
 static void
 stats_class(struct Client *source_p)
 {
-	if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
+	if(ConfigFileEntry.stats_y_oper_only && !IsOperGeneral(source_p))
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
 				   form_str (ERR_NOPRIVILEGES));
 	else
@@ -1500,7 +1440,7 @@ stats_servlinks (struct Client *source_p)
 	int j = 0;
 	char buf[128];
 
-	if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
+	if(ConfigServerHide.flatten_links && !IsOperGeneral (source_p) &&
 	   !IsExemptShide(source_p))
 	{
 		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
@@ -1529,7 +1469,7 @@ stats_servlinks (struct Client *source_p)
 			rb_current_time() - target_p->localClient->firsttime,
 			(rb_current_time() > target_p->localClient->lasttime) ?
 			 (rb_current_time() - target_p->localClient->lasttime) : 0,
-			IsOper (source_p) ? show_capabilities (target_p) : "TS");
+			IsOperGeneral (source_p) ? show_capabilities (target_p) : "TS");
 	}
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
@@ -1557,32 +1497,34 @@ stats_servlinks (struct Client *source_p)
 	sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server recv: %s", buf);
 }
 
-static int
-stats_l_should_show_oper(struct Client *target_p)
+static inline bool
+stats_l_should_show_oper(struct Client *source_p, struct Client *target_p)
 {
-	if (IsOperInvis(target_p))
-		return 0;
-
-	return 1;
+	return SeesOper(target_p, source_p);
 }
 
 static void
 stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 {
-	int doall = 0;
-	int wilds = 0;
+	bool doall = false;
+	bool wilds = false;
 	const char *name;
 	char statchar = parv[1][0];
 
+	if (ConfigFileEntry.stats_l_oper_only == STATS_L_OPER_ONLY_YES && !IsOperGeneral(source_p))
+	{
+		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+		return;
+	}
+
 	/* this is def targeted at us somehow.. */
-	if(parc > 2 && !EmptyString(parv[2]))
+	if (parc > 2 && !EmptyString(parv[2]))
 	{
 		/* directed at us generically? */
-		if(match(parv[2], me.name) ||
-		   (!MyClient(source_p) && !irccmp(parv[2], me.id)))
+		if (match(parv[2], me.name) || (!MyClient(source_p) && !irccmp(parv[2], me.id)))
 		{
 			name = me.name;
-			doall = 1;
+			doall = true;
 		}
 		else
 		{
@@ -1591,24 +1533,31 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 		}
 
 		/* must be directed at a specific person thats not us */
-		if(!doall && !wilds)
+		if (!doall && !wilds)
 		{
 			struct Client *target_p;
 
-			if(MyClient(source_p))
+			if (MyClient(source_p))
 				target_p = find_named_person(name);
 			else
 				target_p = find_person(name);
 
-			if(target_p != NULL)
+			if (target_p != source_p && ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO
+					&& !IsOperGeneral(source_p))
+			{
+				sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+			}
+			else if (target_p != NULL)
 			{
 				stats_spy(source_p, statchar, target_p->name);
 				stats_l_client(source_p, target_p, statchar);
 			}
 			else
+			{
 				sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
 						form_str(ERR_NOSUCHSERVER),
 						name);
+			}
 
 			return;
 		}
@@ -1616,12 +1565,21 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 	else
 	{
 		name = me.name;
-		doall = 1;
+		doall = true;
 	}
 
 	stats_spy(source_p, statchar, name);
 
-	if(doall)
+	if (ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO && !IsOperGeneral(source_p))
+	{
+		if (doall && MyClient(source_p))
+			stats_l_client(source_p, source_p, statchar);
+		else
+			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+		return;
+	}
+
+	if (doall)
 	{
 		/* local opers get everyone */
 		if(MyOper(source_p))
@@ -1638,7 +1596,7 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 			stats_l_list(source_p, name, doall, wilds, &local_oper_list, statchar, stats_l_should_show_oper);
 		}
 
-		if (!ConfigServerHide.flatten_links || IsOper(source_p) ||
+		if (!ConfigServerHide.flatten_links || IsOperGeneral(source_p) ||
 				IsExemptShide(source_p))
 			stats_l_list(source_p, name, doall, wilds, &serv_list, statchar, NULL);
 
@@ -1654,8 +1612,8 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
 }
 
 static void
-stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
-	     rb_dlink_list * list, char statchar, int (*check_fn)(struct Client *target_p))
+stats_l_list(struct Client *source_p, const char *name, bool doall, bool wilds,
+	     rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *source_p, struct Client *target_p))
 {
 	rb_dlink_node *ptr;
 	struct Client *target_p;
@@ -1671,7 +1629,7 @@ stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
 		if(!doall && wilds && !match(name, target_p->name))
 			continue;
 
-		if (check_fn == NULL || check_fn(target_p))
+		if (check_fn == NULL || check_fn(source_p, target_p))
 			stats_l_client(source_p, target_p, statchar);
 	}
 }
@@ -1692,7 +1650,7 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
 				rb_current_time() - target_p->localClient->firsttime,
 				(rb_current_time() > target_p->localClient->lasttime) ?
 				 (rb_current_time() - target_p->localClient->lasttime) : 0,
-				IsOper(source_p) ? show_capabilities(target_p) : "-");
+				IsOperGeneral(source_p) ? show_capabilities(target_p) : "-");
 	}
 
 	else
@@ -1736,10 +1694,6 @@ stats_comm(struct Client *source_p)
  * output	- none
  * side effects -
  * This little helper function reports to opers if configured.
- * personally, I don't see why opers need to see stats requests
- * at all. They are just "noise" to an oper, and users can't do
- * any damage with stats requests now anyway. So, why show them?
- * -Dianora
  */
 static int
 stats_spy(struct Client *source_p, char statchar, const char *name)
@@ -1772,4 +1726,3 @@ stats_p_spy (struct Client *source_p)
 
 	call_hook(doing_stats_p_hook, &data);
 }
-