X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e68712582bde42df275ed7989fef5e1d39dd2973..29c8637abbfafd8a85a20fe1c3b37a0ffaae9d84:/modules/m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index df64e79..89b6aee 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -39,7 +39,7 @@
 #include "send.h"		/* sendto_one */
 #include "s_conf.h"		/* ConfItem */
 #include "s_serv.h"		/* hunt_server */
-#include "s_stats.h"		/* tstats */
+#include "s_stats.h"
 #include "s_user.h"		/* show_opers */
 #include "blacklist.h"		/* dnsbl stuff */
 #include "parse.h"
@@ -47,6 +47,8 @@
 #include "hook.h"
 #include "s_newconf.h"
 #include "hash.h"
+#include "reject.h"
+#include "whowas.h"
 
 static int m_stats (struct Client *, struct Client *, int, const char **);
 
@@ -195,7 +197,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if(MyClient(source_p) && !IsOper(source_p))
 	{
 		/* Check the user is actually allowed to do /stats, and isnt flooding */
-		if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
 		{
 			/* safe enough to give this on a local connect only */
 			sendto_one(source_p, form_str(RPL_LOAD2HI),
@@ -205,7 +207,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
 			return 0;
 		}
 		else
-			last_used = CurrentTime;
+			last_used = rb_current_time();
 	}
 
 	if(hunt_server (client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
@@ -443,17 +445,16 @@ stats_exempt(struct Client *source_p)
 	}}
 
 
-static void
-stats_events_cb(char *str, void *ptr)
-{
-	sendto_one_numeric(ptr, RPL_STATSDEBUG, "E :%s", str);
-}
-
-static void
-stats_events (struct Client *source_p)
-{
-	rb_dump_events(stats_events_cb, source_p);
-	send_pop_queue(source_p);
+static void
+stats_events_cb(char *str, void *ptr)
+{
+	sendto_one_numeric(ptr, RPL_STATSDEBUG, "E :%s", str);
+}
+
+static void
+stats_events (struct Client *source_p)
+{
+	rb_dump_events(stats_events_cb, source_p);
 }
 
 /* stats_pending_glines()
@@ -894,7 +895,7 @@ stats_usage (struct Client *source_p)
 	if(0 == secs)
 		secs = 1;
 
-	rup = (CurrentTime - startup_time) * hzz;
+	rup = (rb_current_time() - startup_time) * hzz;
 	if(0 == rup)
 		rup = 1;
   
@@ -927,7 +928,104 @@ stats_usage (struct Client *source_p)
 static void
 stats_tstats (struct Client *source_p)
 {
-	tstats (source_p);
+	struct Client *target_p;
+	struct ServerStatistics sp;
+	rb_dlink_node *ptr;
+
+	memcpy(&sp, &ServerStats, sizeof(struct ServerStatistics));
+
+	RB_DLINK_FOREACH(ptr, serv_list.head)
+	{
+		target_p = ptr->data;
+
+		sp.is_sbs += target_p->localClient->sendB;
+		sp.is_sbr += target_p->localClient->receiveB;
+		sp.is_sks += target_p->localClient->sendK;
+		sp.is_skr += target_p->localClient->receiveK;
+		sp.is_sti += rb_current_time() - target_p->localClient->firsttime;
+		sp.is_sv++;
+		if(sp.is_sbs > 1023)
+		{
+			sp.is_sks += (sp.is_sbs >> 10);
+			sp.is_sbs &= 0x3ff;
+		}
+		if(sp.is_sbr > 1023)
+		{
+			sp.is_skr += (sp.is_sbr >> 10);
+			sp.is_sbr &= 0x3ff;
+		}
+	}
+
+	RB_DLINK_FOREACH(ptr, lclient_list.head)
+	{
+		target_p = ptr->data;
+
+		sp.is_cbs += target_p->localClient->sendB;
+		sp.is_cbr += target_p->localClient->receiveB;
+		sp.is_cks += target_p->localClient->sendK;
+		sp.is_ckr += target_p->localClient->receiveK;
+		sp.is_cti += rb_current_time() - target_p->localClient->firsttime;
+		sp.is_cl++;
+		if(sp.is_cbs > 1023)
+		{
+			sp.is_cks += (sp.is_cbs >> 10);
+			sp.is_cbs &= 0x3ff;
+		}
+		if(sp.is_cbr > 1023)
+		{
+			sp.is_ckr += (sp.is_cbr >> 10);
+			sp.is_cbr &= 0x3ff;
+		}
+
+	}
+
+	RB_DLINK_FOREACH(ptr, unknown_list.head)
+	{
+		sp.is_ni++;
+	}
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :accepts %u refused %u", sp.is_ac, sp.is_ref);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			"T :rejected %u delaying %lu", 
+			sp.is_rej, rb_dlink_list_length(&delay_exit));
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			"T :nicks being delayed %lu",
+			get_nd_count());
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :unknown commands %u prefixes %u",
+			   sp.is_unco, sp.is_unpf);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :nick collisions %u saves %u unknown closes %u",
+			   sp.is_kill, sp.is_save, sp.is_ni);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :wrong direction %u empty %u", 
+			   sp.is_wrdi, sp.is_empt);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :numerics seen %u", sp.is_num);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :tgchange blocked msgs %u restricted addrs %lu",
+			   sp.is_tgch, rb_dlink_list_length(&tgchange_list));
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :auth successes %u fails %u",
+			   sp.is_asuc, sp.is_abad);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :sasl successes %u fails %u",
+			   sp.is_ssuc, sp.is_sbad);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG, "T :Client Server");
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :connected %u %u", sp.is_cl, sp.is_sv);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :bytes sent %d.%uK %d.%uK",
+			   (int) sp.is_cks, sp.is_cbs, 
+			   (int) sp.is_sks, sp.is_sbs);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :bytes recv %d.%uK %d.%uK",
+			   (int) sp.is_ckr, sp.is_cbr, 
+			   (int) sp.is_skr, sp.is_sbr);
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "T :time connected %d %d",
+			   (int) sp.is_cti, (int) sp.is_sti);
 }
 
 static void
@@ -935,7 +1033,7 @@ stats_uptime (struct Client *source_p)
 {
 	time_t now;
 
-	now = CurrentTime - startup_time;
+	now = rb_current_time() - startup_time;
 	sendto_one_numeric(source_p, RPL_STATSUPTIME, 
 			   form_str (RPL_STATSUPTIME),
 			   now / 86400, (now / 3600) % 24, 
@@ -1049,7 +1147,7 @@ stats_servers (struct Client *source_p)
 		target_p = ptr->data;
 
 		j++;
-		seconds = CurrentTime - target_p->localClient->firsttime;
+		seconds = rb_current_time() - target_p->localClient->firsttime;
 
 		days = (int) (seconds / 86400);
 		seconds %= 86400;
@@ -1063,7 +1161,7 @@ stats_servers (struct Client *source_p)
 				   "Connected: %d day%s, %d:%02d:%02d",
 				   target_p->name,
 				   (target_p->serv->by[0] ? target_p->serv->by : "Remote."),
-				   (int) (CurrentTime - target_p->localClient->lasttime),
+				   (int) (rb_current_time() - target_p->localClient->lasttime),
 				   (int) rb_linebuf_len (&target_p->localClient->buf_sendq),
 				   days, (days == 1) ? "" : "s", hours, minutes, 
 				   (int) seconds);
@@ -1122,7 +1220,224 @@ stats_class(struct Client *source_p)
 static void
 stats_memory (struct Client *source_p)
 {
-	count_memory (source_p);
+	struct Client *target_p;
+	struct Channel *chptr;
+	struct Ban *actualBan;
+	rb_dlink_node *rb_dlink;
+	rb_dlink_node *ptr;
+	int channel_count = 0;
+	int local_client_conf_count = 0;	/* local client conf links */
+	int users_counted = 0;	/* user structs */
+
+	int channel_users = 0;
+	int channel_invites = 0;
+	int channel_bans = 0;
+	int channel_except = 0;
+	int channel_invex = 0;
+	int channel_quiets = 0;
+
+	int class_count = 0;	/* classes */
+	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;
+	size_t channel_ban_memory = 0;
+	size_t channel_except_memory = 0;
+	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 */
+	size_t mem_servers_cached;	/* memory used by scache */
+
+	size_t linebuf_count = 0;
+	size_t linebuf_memory_used = 0;
+
+	size_t total_channel_memory = 0;
+	size_t totww = 0;
+
+	size_t local_client_count = 0;
+	size_t local_client_memory_used = 0;
+
+	size_t remote_client_count = 0;
+	size_t remote_client_memory_used = 0;
+
+	size_t total_memory = 0;
+
+	count_whowas_memory(&ww, &wwm);
+
+	RB_DLINK_FOREACH(ptr, global_client_list.head)
+	{
+		target_p = ptr->data;
+		if(MyConnect(target_p))
+		{
+			local_client_conf_count++;
+		}
+
+		if(target_p->user)
+		{
+			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);
+			}
+		}
+	}
+
+	/* Count up all channels, ban lists, except lists, Invex lists */
+	RB_DLINK_FOREACH(ptr, global_channel_list.head)
+	{
+		chptr = ptr->data;
+		channel_count++;
+		channel_memory += (strlen(chptr->chname) + sizeof(struct Channel));
+
+		channel_users += rb_dlink_list_length(&chptr->members);
+		channel_invites += rb_dlink_list_length(&chptr->invites);
+
+		RB_DLINK_FOREACH(rb_dlink, chptr->banlist.head)
+		{
+			actualBan = rb_dlink->data;
+			channel_bans++;
+
+			channel_ban_memory += sizeof(rb_dlink_node) + sizeof(struct Ban);
+		}
+
+		RB_DLINK_FOREACH(rb_dlink, chptr->exceptlist.head)
+		{
+			actualBan = rb_dlink->data;
+			channel_except++;
+
+			channel_except_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
+		}
+
+		RB_DLINK_FOREACH(rb_dlink, chptr->invexlist.head)
+		{
+			actualBan = rb_dlink->data;
+			channel_invex++;
+
+			channel_invex_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
+		}
+
+		RB_DLINK_FOREACH(rb_dlink, chptr->quietlist.head)
+		{
+			actualBan = rb_dlink->data;
+			channel_quiets++;
+
+			channel_quiet_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
+		}
+	}
+
+	/* count up all classes */
+
+	class_count = rb_dlink_list_length(&class_list) + 1;
+
+	rb_count_rb_linebuf_memory(&linebuf_count, &linebuf_memory_used);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Users %u(%lu) Invites %u(%lu)",
+			   users_counted,
+			   (unsigned long) users_counted * sizeof(struct User),
+			   users_invited_count, 
+			   (unsigned long) users_invited_count * sizeof(rb_dlink_node));
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :User channels %u(%lu) Aways %u(%d)",
+			   user_channels,
+			   (unsigned long) user_channels * sizeof(rb_dlink_node),
+			   aways_counted, (int) away_memory);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Attached confs %u(%lu)",
+			   local_client_conf_count,
+			   (unsigned long) local_client_conf_count * sizeof(rb_dlink_node));
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Conflines %u(%d)", conf_count, (int) conf_memory);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Classes %u(%lu)",
+			   class_count, 
+			   (unsigned long) class_count * sizeof(struct Class));
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Channels %u(%d)",
+			   channel_count, (int) channel_memory);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Bans %u(%d) Exceptions %u(%d) Invex %u(%d) Quiets %u(%d)",
+			   channel_bans, (int) channel_ban_memory,
+			   channel_except, (int) channel_except_memory,
+			   channel_invex, (int) channel_invex_memory,
+			   channel_quiets, (int) channel_quiet_memory);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Channel members %u(%lu) invite %u(%lu)",
+			   channel_users,
+			   (unsigned long) channel_users * sizeof(rb_dlink_node),
+			   channel_invites, 
+			   (unsigned long) channel_invites * sizeof(rb_dlink_node));
+
+	total_channel_memory = channel_memory +
+		channel_ban_memory +
+		channel_users * sizeof(rb_dlink_node) + channel_invites * sizeof(rb_dlink_node);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Whowas array %ld(%ld)",
+			   (long)ww, (long)wwm);
+
+	totww = wwm;
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Hash: client %u(%ld) chan %u(%ld)",
+			   U_MAX, (long)(U_MAX * sizeof(rb_dlink_list)), 
+			   CH_MAX, (long)(CH_MAX * sizeof(rb_dlink_list)));
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :linebuf %ld(%ld)",
+			   (long)linebuf_count, (long)linebuf_memory_used);
+
+	count_scache(&number_servers_cached, &mem_servers_cached);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :scache %ld(%ld)",
+			   (long)number_servers_cached, (long)mem_servers_cached);
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :hostname hash %d(%ld)",
+			   HOST_MAX, (long)HOST_MAX * sizeof(rb_dlink_list));
+
+	total_memory = totww + total_channel_memory + conf_memory +
+		class_count * sizeof(struct Class);
+
+	total_memory += mem_servers_cached;
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Total: whowas %d channel %d conf %d", 
+			   (int) totww, (int) total_channel_memory, 
+			   (int) conf_memory);
+
+	count_local_client_memory(&local_client_count, &local_client_memory_used);
+	total_memory += local_client_memory_used;
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Local client Memory in use: %ld(%ld)",
+			   (long)local_client_count, (long)local_client_memory_used);
+
+
+	count_remote_client_memory(&remote_client_count, &remote_client_memory_used);
+	total_memory += remote_client_memory_used;
+
+	sendto_one_numeric(source_p, RPL_STATSDEBUG,
+			   "z :Remote client Memory in use: %ld(%ld)",
+			   (long)remote_client_count,
+			   (long)remote_client_memory_used);
 }
 
 static void
@@ -1130,27 +1445,25 @@ stats_ziplinks (struct Client *source_p)
 {
 	rb_dlink_node *ptr;
 	struct Client *target_p;
+	struct ZipStats *zipstats;
 	int sent_data = 0;
-
+	char buf[128], buf1[128];
 	RB_DLINK_FOREACH (ptr, serv_list.head)
 	{
 		target_p = ptr->data;
 		if(IsCapable (target_p, CAP_ZIP))
 		{
-			/* we use memcpy(3) and a local copy of the structure to
-			 * work around a register use bug on GCC on the SPARC.
-			 * -jmallett, 04/27/2002
-			 */
-			struct ZipStats zipstats;
-			memcpy (&zipstats, &target_p->localClient->zipstats,
-				sizeof (struct ZipStats)); 
+			zipstats = target_p->localClient->zipstats;				
+			sprintf(buf, "%.2f%%", zipstats->out_ratio);
+			sprintf(buf1, "%.2f%%", zipstats->in_ratio);
 			sendto_one_numeric(source_p, RPL_STATSDEBUG,
-					    "Z :ZipLinks stats for %s send[%.2f%% compression "
-					    "(%lu kB data/%lu kB wire)] recv[%.2f%% compression "
-					    "(%lu kB data/%lu kB wire)]",
+					    "Z :ZipLinks stats for %s send[%s compression "
+					    "(%llu kB data/%llu kB wire)] recv[%s compression "
+					    "(%llu kB data/%llu kB wire)]",
 					    target_p->name,
-					    zipstats.out_ratio, zipstats.outK, zipstats.outK_wire,
-					    zipstats.in_ratio, zipstats.inK, zipstats.inK_wire);
+					    buf, zipstats->out >> 10, 
+					    zipstats->out_wire >> 10, buf1, 
+					    zipstats->in >> 10, zipstats->in_wire >> 10);
 			sent_data++;
 		}
 	}
@@ -1167,6 +1480,7 @@ stats_servlinks (struct Client *source_p)
 	struct Client *target_p;
 	rb_dlink_node *ptr;
 	int j = 0;
+	char buf[128];
 
 	if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
 	   !IsExemptShide(source_p))
@@ -1189,39 +1503,40 @@ stats_servlinks (struct Client *source_p)
 		sendto_one(source_p, Sformat,
 			get_id(&me, source_p), RPL_STATSLINKINFO, get_id(source_p, source_p),
 			get_server_name(target_p, SHOW_IP),
-			(int) linebuf_len (&target_p->localClient->buf_sendq),
+			(int) rb_linebuf_len (&target_p->localClient->buf_sendq),
 			(int) target_p->localClient->sendM,
 			(int) target_p->localClient->sendK,
 			(int) target_p->localClient->receiveM,
 			(int) target_p->localClient->receiveK,
-			CurrentTime - target_p->localClient->firsttime,
-			(CurrentTime > target_p->localClient->lasttime) ? 
-			 (CurrentTime - target_p->localClient->lasttime) : 0,
+			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");
 	}
 
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
 			   "? :%u total server(s)", j);
 
+	snprintf(buf, sizeof buf, "%7.2f", _GMKv ((sendK)));
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			   "? :Sent total : %7.2f %s",
-			   _GMKv (sendK), _GMKs (sendK));
+			   "? :Sent total : %s %s",
+			   buf, _GMKs (sendK));
+	snprintf(buf, sizeof buf, "%7.2f", _GMKv ((receiveK)));
 	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			   "? :Recv total : %7.2f %s",
-			   _GMKv (receiveK), _GMKs (receiveK));
-
-	uptime = (CurrentTime - startup_time);
+			   "? :Recv total : %s %s",
+			   buf, _GMKs (receiveK));
 
-	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			   "? :Server send: %7.2f %s (%4.1f K/s)",
+	uptime = (rb_current_time() - startup_time);
+	snprintf(buf, sizeof buf, "%7.2f %s (%4.1f K/s)",
 			   _GMKv (me.localClient->sendK), 
 			   _GMKs (me.localClient->sendK),
 			   (float) ((float) me.localClient->sendK / (float) uptime));
-	sendto_one_numeric(source_p, RPL_STATSDEBUG,
-			   "? :Server recv: %7.2f %s (%4.1f K/s)",
+	sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server send: %s", buf);
+	snprintf(buf, sizeof buf, "%7.2f %s (%4.1f K/s)",
 			   _GMKv (me.localClient->receiveK),
 			   _GMKs (me.localClient->receiveK),
 			   (float) ((float) me.localClient->receiveK / (float) uptime));
+	sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server recv: %s", buf);
 }
 
 static void
@@ -1342,14 +1657,14 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
 	{
 		sendto_one_numeric(source_p, RPL_STATSLINKINFO, Lformat,
 				get_server_name(target_p, SHOW_IP),
-				(int) linebuf_len(&target_p->localClient->buf_sendq),
+				(int) rb_linebuf_len(&target_p->localClient->buf_sendq),
 				(int) target_p->localClient->sendM,
 				(int) target_p->localClient->sendK,
 				(int) target_p->localClient->receiveM,
 				(int) target_p->localClient->receiveK,
-				CurrentTime - target_p->localClient->firsttime,
-				(CurrentTime > target_p->localClient->lasttime) ? 
-				 (CurrentTime - target_p->localClient->lasttime) : 0,
+				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) : "-");
 	}
 
@@ -1361,30 +1676,29 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
 				     get_client_name(target_p, SHOW_IP) :
 				     get_client_name(target_p, HIDE_IP)) :
 				    get_client_name(target_p, MASK_IP),
-				    (int) linebuf_len(&target_p->localClient->buf_sendq),
+				    (int) rb_linebuf_len(&target_p->localClient->buf_sendq),
 				    (int) target_p->localClient->sendM,
 				    (int) target_p->localClient->sendK,
 				    (int) target_p->localClient->receiveM,
 				    (int) target_p->localClient->receiveK,
-				    CurrentTime - target_p->localClient->firsttime,
-				    (CurrentTime > target_p->localClient->lasttime) ? 
-				     (CurrentTime - target_p->localClient->lasttime) : 0,
+				    rb_current_time() - target_p->localClient->firsttime,
+				    (rb_current_time() > target_p->localClient->lasttime) ? 
+				     (rb_current_time() - target_p->localClient->lasttime) : 0,
 				    "-");
 	}
 }
 
-static void
-rb_dump_fd_callback(int fd, const char *desc, void *data)
-{
-	struct Client *source_p = data;
-	sendto_one_numeric(source_p, RPL_STATSDEBUG, "F :fd %-3d desc '%s'", fd, desc);
-}
-
-static void
-stats_comm(struct Client *source_p)
-{
-	rb_dump_fd(rb_dump_fd_callback, source_p);
-	send_pop_queue(source_p);
+static void
+rb_dump_fd_callback(int fd, const char *desc, void *data)
+{
+	struct Client *source_p = data;
+	sendto_one_numeric(source_p, RPL_STATSDEBUG, "F :fd %-3d desc '%s'", fd, desc);
+}
+
+static void
+stats_comm(struct Client *source_p)
+{
+	rb_dump_fd(rb_dump_fd_callback, source_p);
 }
 
 /*