X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/143b6cc1e4a8faa8181301bf43ddafecab3237cc..320a0f852891ac719c4c3349cfae836f8174bc4f:/modules/m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index b5738a7..12adc9c 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -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 *);
@@ -148,7 +149,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 +174,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
  *
@@ -674,10 +674,15 @@ 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) ? get_oper_privs(oper_p->flags) : "0", "-1");
+				IsOper(source_p) ? oper_p->privset->name : "0", "-1");
 	}
 }
 
+static void
+stats_privset(struct Client *source_p)
+{
+	privilegeset_report(source_p);
+}
 
 /* stats_operedup()
  *
@@ -699,7 +704,7 @@ stats_operedup (struct Client *source_p)
 		if(IsOperInvis(target_p) && !IsOper(source_p))
 			continue;
 
-		if(target_p->user->away)
+		if(get_metadata(target_p, "away"))
 			continue;
 
 		count++;
@@ -852,7 +857,7 @@ stats_tstats (struct Client *source_p)
 
 		sp.is_sbs += target_p->localClient->sendB;
 		sp.is_sbr += target_p->localClient->receiveB;
-		sp.is_sti += rb_current_time() - target_p->localClient->firsttime;
+		sp.is_sti += (unsigned long long)(rb_current_time() - target_p->localClient->firsttime);
 		sp.is_sv++;
 	}
 
@@ -862,7 +867,7 @@ stats_tstats (struct Client *source_p)
 
 		sp.is_cbs += target_p->localClient->sendB;
 		sp.is_cbr += target_p->localClient->receiveB;
-		sp.is_cti += rb_current_time() - target_p->localClient->firsttime;
+		sp.is_cti += (unsigned long long)(rb_current_time() - target_p->localClient->firsttime);
 		sp.is_cl++;
 	}
 
@@ -876,6 +881,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());
@@ -911,8 +918,8 @@ stats_tstats (struct Client *source_p)
 				sp.is_cbr / 1024, 
 				sp.is_sbr / 1024);
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-				"T :time connected %lu %lu",
-				(long int)sp.is_cti, (long int)sp.is_sti);
+				"T :time connected %llu %llu",
+				sp.is_cti, sp.is_sti);
 }
 
 static void
@@ -949,9 +956,9 @@ static struct shared_flags shared_flagtable[] =
 	{ SHARED_UNRESV,	'R' },
 	{ SHARED_LOCOPS,	'L' },
 	{ SHARED_REHASH,	'H' },
-	{ SHARED_TDLINE,    'd' },
-	{ SHARED_PDLINE,    'D' },
-	{ SHARED_UNDLINE,   'E' },
+	{ SHARED_TDLINE,	'd' },
+	{ SHARED_PDLINE,	'D' },
+	{ SHARED_UNDLINE,	'E' },
 	{ 0,			'\0'}
 };
 
@@ -961,7 +968,7 @@ stats_shared (struct Client *source_p)
 {
 	struct remote_conf *shared_p;
 	rb_dlink_node *ptr;
-	char buf[15];
+	char buf[sizeof(shared_flagtable)/sizeof(shared_flagtable[0])];
 	char *p;
 	int i;
 
@@ -1130,7 +1137,6 @@ stats_memory (struct Client *source_p)
 	int conf_count = 0;	/* conf lines */
 	int users_invited_count = 0;	/* users invited */
 	int user_channels = 0;	/* users in channels */
-	int aways_counted = 0;
 	size_t number_servers_cached;	/* number of servers cached by scache */
 
 	size_t channel_memory = 0;
@@ -1139,7 +1145,6 @@ stats_memory (struct Client *source_p)
 	size_t channel_invex_memory = 0;
 	size_t channel_quiet_memory = 0;
 
-	size_t away_memory = 0;	/* memory used by aways */
 	size_t ww = 0;		/* whowas array count */
 	size_t wwm = 0;		/* whowas array memory used */
 	size_t conf_memory = 0;	/* memory used by conf lines */
@@ -1174,11 +1179,6 @@ stats_memory (struct Client *source_p)
 			users_counted++;
 			users_invited_count += rb_dlink_list_length(&target_p->user->invited);
 			user_channels += rb_dlink_list_length(&target_p->user->channel);
-			if(target_p->user->away)
-			{
-				aways_counted++;
-				away_memory += (strlen(target_p->user->away) + 1);
-			}
 		}
 	}
 
@@ -1239,10 +1239,9 @@ stats_memory (struct Client *source_p)
 			   (unsigned long) users_invited_count * sizeof(rb_dlink_node));
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			   "z :User channels %u(%lu) Aways %u(%d)",
+			   "z :User channels %u(%lu)",
 			   user_channels,
-			   (unsigned long) user_channels * sizeof(rb_dlink_node),
-			   aways_counted, (int) away_memory);
+			   (unsigned long) user_channels * sizeof(rb_dlink_node));
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
 			   "z :Attached confs %u(%lu)",