X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/17d00839b3821b7b41212b3ed2b3da2711f24618..refs/tags/shadowircd-6.2.0-beta1:/modules/m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index b779b96..dc826bc 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -21,7 +21,6 @@
  *  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"
@@ -94,6 +93,7 @@ static void stats_tdeny(struct Client *);
 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 *);
@@ -101,6 +101,7 @@ static void stats_klines(struct Client *);
 static void stats_messages(struct Client *);
 static void stats_dnsbl(struct Client *);
 static void stats_oper(struct Client *);
+static void stats_privset(struct Client *);
 static void stats_operedup(struct Client *);
 static void stats_ports(struct Client *);
 static void stats_tresv(struct Client *);
@@ -136,6 +137,7 @@ static struct StatsStruct stats_cmd_table[] = {
 	{'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, },
@@ -148,7 +150,7 @@ static struct StatsStruct stats_cmd_table[] = {
 	{'M', stats_messages,		0, 0, },
 	{'n', stats_dnsbl,		0, 0, },
 	{'o', stats_oper,		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, },
@@ -173,7 +175,6 @@ static struct StatsStruct stats_cmd_table[] = {
 
 /*
  * m_stats by fl_
- *      parv[0] = sender prefix
  *      parv[1] = stat letter/command
  *      parv[2] = (if present) server/mask in stats L, or target
  *
@@ -450,6 +451,32 @@ stats_events (struct Client *source_p)
 	rb_dump_events(stats_events_cb, source_p);
 }
 
+static void
+stats_prop_klines(struct Client *source_p)
+{
+	struct ConfItem *aconf;
+	rb_dlink_node *ptr;
+	char *user, *host, *pass, *oper_reason;
+
+	RB_DLINK_FOREACH(ptr, prop_bans.head)
+	{
+		aconf = ptr->data;
+
+		/* Skip non-klines and deactivated klines. */
+		if(aconf->status != CONF_KILL)
+			continue;
+
+		get_printable_kline(source_p, aconf, &host, &pass, 
+				&user, &oper_reason);
+
+		sendto_one_numeric(source_p, RPL_STATSKLINE,
+				form_str(RPL_STATSKLINE),
+				'g', host, user, pass,
+				oper_reason ? "|" : "",
+				oper_reason ? oper_reason : "");
+	}
+}
+
 static void
 stats_hubleaf(struct Client *source_p)
 {
@@ -678,6 +705,11 @@ stats_oper(struct Client *source_p)
 	}
 }
 
+static void
+stats_privset(struct Client *source_p)
+{
+	privilegeset_report(source_p);
+}
 
 /* stats_operedup()
  *
@@ -739,7 +771,7 @@ stats_tresv(struct Client *source_p)
 		if(aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE, 
 					form_str(RPL_STATSQLINE),
-					'q', aconf->port, aconf->name, aconf->passwd);
+					'q', aconf->port, aconf->host, aconf->passwd);
 	}
 
 	HASH_WALK(i, R_MAX, ptr, resvTable)
@@ -748,7 +780,7 @@ stats_tresv(struct Client *source_p)
 		if(aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE, 
 					form_str(RPL_STATSQLINE),
-					'q', aconf->port, aconf->name, aconf->passwd);
+					'q', aconf->port, aconf->host, aconf->passwd);
 	}
 	HASH_WALK_END
 }
@@ -767,7 +799,7 @@ stats_resv(struct Client *source_p)
 		if(!aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE, 
 					form_str(RPL_STATSQLINE),
-					'Q', aconf->port, aconf->name, aconf->passwd);
+					'Q', aconf->port, aconf->host, aconf->passwd);
 	}
 
 	HASH_WALK(i, R_MAX, ptr, resvTable)
@@ -776,7 +808,7 @@ stats_resv(struct Client *source_p)
 		if(!aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSQLINE, 
 					form_str(RPL_STATSQLINE),
-					'Q', aconf->port, aconf->name, aconf->passwd);
+					'Q', aconf->port, aconf->host, aconf->passwd);
 	}
 	HASH_WALK_END
 }
@@ -876,6 +908,8 @@ stats_tstats (struct Client *source_p)
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
 			"T :rejected %u delaying %lu", 
 			sp.is_rej, delay_exit_length());
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :throttled refused %u throttle list size %lu", sp.is_thr, throttle_size());
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
 			"T :nicks being delayed %lu",
 			get_nd_count());
@@ -952,6 +986,8 @@ static struct shared_flags shared_flagtable[] =
 	{ SHARED_TDLINE,	'd' },
 	{ SHARED_PDLINE,	'D' },
 	{ SHARED_UNDLINE,	'E' },
+	{ SHARED_DIE,       'I' },
+	{ SHARED_MODULE,	'M' },
 	{ 0,			'\0'}
 };
 
@@ -1074,7 +1110,7 @@ stats_tgecos(struct Client *source_p)
 		if(aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSXLINE,
 					form_str(RPL_STATSXLINE),
-					'x', aconf->port, aconf->name,
+					'x', aconf->port, aconf->host,
 					aconf->passwd);
 	}
 }
@@ -1092,7 +1128,7 @@ stats_gecos(struct Client *source_p)
 		if(!aconf->hold)
 			sendto_one_numeric(source_p, RPL_STATSXLINE,
 					form_str(RPL_STATSXLINE),
-					'X', aconf->port, aconf->name, 
+					'X', aconf->port, aconf->host, 
 					aconf->passwd);
 	}
 }