ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/modules/m_stats.c

Comparing:
ircd-hybrid-7.2/modules/m_stats.c (file contents), Revision 34 by lusky, Sun Oct 2 21:05:51 2005 UTC vs.
ircd-hybrid/trunk/modules/m_stats.c (file contents), Revision 1592 by michael, Sat Oct 27 21:02:32 2012 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"       /* dlink_node/dlink_list */
27	<	#include "handlers.h"    /* m_pass prototype */
26	>	#include "list.h"        /* dlink_node/dlink_list */
27	>	#include "balloc.h"
28		#include "client.h"      /* Client */
29	–	#include "common.h"      /* TRUE/FALSE */
29		#include "irc_string.h"
30		#include "ircd.h"        /* me */
31		#include "listener.h"    /* show_ports */
32		#include "s_gline.h"
34	–	#include "ircd_handler.h"
35	–	#include "msg.h"         /* Message */
33		#include "hostmask.h"
34		#include "numeric.h"     /* ERR_xxx */
35		#include "send.h"        /* sendto_one */
36		#include "fdlist.h"      /* PF and friends */
37		#include "s_bsd.h"       /* highest_fd */
38	<	#include "s_conf.h"      /* AccessItem, report_configured_links */
38	>	#include "conf.h"      /* AccessItem, report_configured_links */
39		#include "s_misc.h"      /* serv_info */
40		#include "s_serv.h"      /* hunt_server */
44	–	#include "s_stats.h"     /* tstats */
41		#include "s_user.h"      /* show_opers */
42		#include "event.h"       /* events */
43		#include "dbuf.h"
44	+	#include "hook.h"
45		#include "parse.h"
46		#include "modules.h"
50	–	#include "hook.h"
47		#include "resv.h"  /* report_resv */
48		#include "whowas.h"
49	<	#include "list.h"
50	<
55	<	static void do_stats(struct Client *, int, char **);
56	<	static void m_stats(struct Client *, struct Client *, int, char *[]);
57	<	static void mo_stats(struct Client *, struct Client *, int, char *[]);
58	<	static void ms_stats(struct Client *, struct Client *, int, char *[]);
49	>	#include "watch.h"
50	>	#include "irc_res.h"
51
60	–	struct Message stats_msgtab = {
61	–	"STATS", 0, 0, 2, 0, MFLG_SLOW, 0,
62	–	{ m_unregistered, m_stats, ms_stats, m_ignore, mo_stats, m_ignore }
63	–	};
64	–
65	–	#ifndef STATIC_MODULES
66	–	const char *_version = "$Revision$";
67	–	static struct Callback *stats_cb;
68	–
69	–	static void *
70	–	va_stats(va_list args)
71	–	{
72	–	struct Client *source_p = va_arg(args, struct Client *);
73	–	int parc = va_arg(args, int);
74	–	char **parv = va_arg(args, char **);
75	–
76	–	do_stats(source_p, parc, parv);
77	–	return NULL;
78	–	}
79	–
80	–	void
81	–	_modinit(void)
82	–	{
83	–	stats_cb = register_callback("doing_stats", va_stats);
84	–	mod_add_cmd(&stats_msgtab);
85	–	}
86	–
87	–	void
88	–	_moddeinit(void)
89	–	{
90	–	mod_del_cmd(&stats_msgtab);
91	–	uninstall_hook(stats_cb, va_stats);
92	–	}
93	–	#endif
94	–
95	–	static char *parse_stats_args(int, char **, int *, int *);
96	–	static void stats_L(struct Client *, char *, int, int, char);
97	–	static void stats_L_list(struct Client *s, char *, int, int, dlink_list *, char);
98	–
99	–	static void stats_dns_servers(struct Client *);
100	–	static void stats_connect(struct Client *);
101	–	static void stats_deny(struct Client *);
102	–	static void stats_tdeny(struct Client *);
103	–	static void stats_exempt(struct Client *);
104	–	static void stats_events(struct Client *);
105	–	static void stats_pending_glines(struct Client *);
106	–	static void stats_glines(struct Client *);
107	–	static void stats_gdeny(struct Client *);
108	–	static void stats_hubleaf(struct Client *);
109	–	static void stats_auth(struct Client *);
110	–	static void stats_tklines(struct Client *);
111	–	static void stats_klines(struct Client *);
112	–	static void stats_messages(struct Client *);
113	–	static void stats_oper(struct Client *);
114	–	static void stats_operedup(struct Client *);
115	–	static void stats_ports(struct Client *);
116	–	static void stats_resv(struct Client *);
117	–	static void stats_usage(struct Client *);
118	–	static void stats_tstats(struct Client *);
119	–	static void stats_uptime(struct Client *);
120	–	static void stats_shared(struct Client *);
121	–	static void stats_servers(struct Client *);
122	–	static void stats_gecos(struct Client *);
123	–	static void stats_class(struct Client *);
124	–	static void stats_memory(struct Client *);
125	–	static void stats_servlinks(struct Client *);
126	–	static void stats_ltrace(struct Client *, int, char **);
127	–	static void stats_ziplinks(struct Client *);
128	–
129	–	/* This table contains the possible stats items, in order:
130	–	* /stats name,  function to call, operonly? adminonly? /stats letter
131	–	* case only matters in the stats letter column.. -- fl_ */
132	–	static const struct StatsStruct
133	–	{
134	–	const unsigned char letter;
135	–	void (*handler)();
136	–	const unsigned int need_oper;
137	–	const unsigned int need_admin;
138	–	} stats_cmd_table[] = {
139	–	/* letter     function            need_oper need_admin */
140	–	{ 'a',        stats_dns_servers,      1,      1,      },
141	–	{ 'A',        stats_dns_servers,      1,      1,      },
142	–	{ 'c',        stats_connect,          1,      0,      },
143	–	{ 'C',        stats_connect,          1,      0,      },
144	–	{ 'd',        stats_tdeny,            1,      0,      },
145	–	{ 'D',        stats_deny,             1,      0,      },
146	–	{ 'e',        stats_exempt,           1,      0,      },
147	–	{ 'E',        stats_events,           1,      1,      },
148	–	{ 'f',        fd_dump,                1,      1,      },
149	–	{ 'F',        fd_dump,                1,      1,      },
150	–	{ 'g',        stats_pending_glines,   1,      0,      },
151	–	{ 'G',        stats_glines,           1,      0,      },
152	–	{ 'h',        stats_hooks,            1,      1,      },
153	–	{ 'H',        stats_hubleaf,          1,      0,      },
154	–	{ 'i',        stats_auth,             0,      0,      },
155	–	{ 'I',        stats_auth,             0,      0,      },
156	–	{ 'k',        stats_tklines,          0,      0,      },
157	–	{ 'K',        stats_klines,           0,      0,      },
158	–	{ 'l',        stats_ltrace,           1,      0,      },
159	–	{ 'L',        stats_ltrace,           1,      0,      },
160	–	{ 'm',        stats_messages,         0,      0,      },
161	–	{ 'M',        stats_messages,         0,      0,      },
162	–	{ 'o',        stats_oper,             0,      0,      },
163	–	{ 'O',        stats_oper,             0,      0,      },
164	–	{ 'p',        stats_operedup,         0,      0,      },
165	–	{ 'P',        stats_ports,            0,      0,      },
166	–	{ 'q',        stats_resv,             1,      0,      },
167	–	{ 'Q',        stats_resv,             1,      0,      },
168	–	{ 'r',        stats_usage,            1,      0,      },
169	–	{ 'R',        stats_usage,            1,      0,      },
170	–	{ 't',        stats_tstats,           1,      0,      },
171	–	{ 'T',        stats_tstats,           1,      0,      },
172	–	{ 'u',        stats_uptime,           0,      0,      },
173	–	{ 'U',        stats_shared,           1,      0,      },
174	–	{ 'v',        stats_servers,          1,      0,      },
175	–	{ 'V',        stats_gdeny,            1,      0,      },
176	–	{ 'x',        stats_gecos,            1,      0,      },
177	–	{ 'X',        stats_gecos,            1,      0,      },
178	–	{ 'y',        stats_class,            1,      0,      },
179	–	{ 'Y',        stats_class,            1,      0,      },
180	–	{ 'z',        stats_memory,           1,      0,      },
181	–	{ 'Z',        stats_ziplinks,         1,      0,      },
182	–	{ '?',        stats_servlinks,        0,      0,      },
183	–	{ '\0',       (void(*)())0,           0,      0,      }
184	–	};
52
53		const char *from, *to;
54
188	–	static void
189	–	do_stats(struct Client *source_p, int parc, char **parv)
190	–	{
191	–	char statchar = *parv[1];
192	–	int i;
193	–
194	–	if (statchar == '\0')
195	–	{
196	–	sendto_one(source_p, form_str(RPL_ENDOFSTATS),
197	–	from, to, '*');
198	–	return;
199	–	}
200	–
201	–	for (i = 0; stats_cmd_table[i].handler; i++)
202	–	{
203	–	if (stats_cmd_table[i].letter == statchar)
204	–	{
205	–	/* The stats table says what privs are needed, so check --fl_ */
206	–	if ((stats_cmd_table[i].need_admin && !IsAdmin(source_p)) ||
207	–	(stats_cmd_table[i].need_oper && !IsOper(source_p)))
208	–	{
209	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
210	–	from, to);
211	–	break;
212	–	}
213	–
214	–	/* Blah, stats L needs the parameters, none of the others do.. */
215	–	if (statchar == 'L' || statchar == 'l')
216	–	stats_cmd_table[i].handler(source_p, parc, parv);
217	–	else
218	–	stats_cmd_table[i].handler(source_p);
219	–
220	–	break;
221	–	}
222	–	}
223	–
224	–	sendto_one(source_p, form_str(RPL_ENDOFSTATS),
225	–	from, to, statchar);
226	–	}
227	–
228	–	/*
229	–	* m_stats()
230	–	*      parv[0] = sender prefix
231	–	*      parv[1] = stat letter/command
232	–	*      parv[2] = (if present) server/mask in stats L
233	–	*
234	–	* This will search the tables for the appropriate stats letter/command,
235	–	* if found execute it.
236	–	*/
237	–	static void
238	–	m_stats(struct Client *client_p, struct Client *source_p,
239	–	int parc, char *parv[])
240	–	{
241	–	static time_t last_used = 0;
242	–
243	–	/* Is the stats meant for us? */
244	–	if (!ConfigFileEntry.disable_remote)
245	–	if (hunt_server(client_p,source_p,":%s STATS %s :%s",2,parc,parv) != HUNTED_ISME)
246	–	return;
247	–
248	–	if (!MyClient(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
249	–	{
250	–	from = me.id;
251	–	to = source_p->id;
252	–	}
253	–	else
254	–	{
255	–	from = me.name;
256	–	to = source_p->name;
257	–	}
258	–
259	–	/* Check the user is actually allowed to do /stats, and isnt flooding */
260	–	if ((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
261	–	{
262	–	sendto_one(source_p,form_str(RPL_LOAD2HI),
263	–	from, to);
264	–	return;
265	–	}
266	–	else
267	–	last_used = CurrentTime;
268	–
269	–	#ifdef STATIC_MODULES
270	–	do_stats(source_p, parc, parv);
271	–	#else
272	–	execute_callback(stats_cb, source_p, parc, parv);
273	–	#endif
274	–	}
275	–
276	–	/*
277	–	* mo_stats()
278	–	*      parv[0] = sender prefix
279	–	*      parv[1] = stat letter/command
280	–	*      parv[2] = (if present) server/mask in stats L, or target
281	–	*
282	–	* This will search the tables for the appropriate stats letter,
283	–	* if found execute it.
284	–	*/
285	–	static void
286	–	mo_stats(struct Client *client_p, struct Client *source_p,
287	–	int parc, char *parv[])
288	–	{
289	–	if (hunt_server(client_p, source_p, ":%s STATS %s :%s", 2,
290	–	parc, parv) != HUNTED_ISME)
291	–	return;
292	–
293	–	if (!MyClient(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
294	–	{
295	–	from = me.id;
296	–	to = source_p->id;
297	–	}
298	–	else
299	–	{
300	–	from = me.name;
301	–	to = source_p->name;
302	–	}
303	–
304	–	#ifdef STATIC_MODULES
305	–	do_stats(source_p, parc, parv);
306	–	#else
307	–	execute_callback(stats_cb, source_p, parc, parv);
308	–	#endif
309	–	}
310	–
55		/*
56		* This is part of the STATS replies. There is no offical numeric for this
57		* since this isnt an official command, in much the same way as HASH isnt.
#	Line 316 | Line 60 | mo_stats(struct Client *client_p, struct
60		* -avalon
61		*/
62		static void
63	<	send_usage(struct Client *source_p)
63	>	stats_usage(struct Client *source_p, int parc, char *parv[])
64		{
321	–	#ifndef _WIN32
65		struct rusage rus;
66		time_t secs;
67		time_t rup;
#	Line 344 | Line 87 | send_usage(struct Client *source_p)
87		if (secs == 0)
88		secs = 1;
89
90	<	rup = (CurrentTime - me.since) * hzz;
90	>	rup = (CurrentTime - me.localClient->since) * hzz;
91
92		if (rup == 0)
93		rup = 1;
#	Line 370 | Line 113 | send_usage(struct Client *source_p)
113		sendto_one(source_p, ":%s %d %s R :Signals %d Context Vol. %d Invol %d",
114		me.name, RPL_STATSDEBUG, source_p->name, (int)rus.ru_nsignals,
115		(int)rus.ru_nvcsw, (int)rus.ru_nivcsw);
373	–	#endif
116		}
117
118		static void
119	<	count_memory(struct Client *source_p)
119	>	stats_memory(struct Client *source_p, int parc, char *parv[])
120		{
121		const dlink_node *gptr = NULL;
122		const dlink_node *dlink = NULL;
123
124	<	int local_client_conf_count = 0;      /* local client conf links */
125	<	int users_counted = 0;                /* user structs */
124	>	unsigned int local_client_conf_count = 0;      /* local client conf links */
125	>	unsigned int users_counted = 0;                /* user structs */
126
127	<	int channel_users = 0; /* XXX */
128	<	int channel_invites = 0;
129	<	int channel_bans = 0;
130	<	int channel_except = 0;
131	<	int channel_invex = 0;
132	<
133	<	int wwu = 0;                  /* whowas users */
134	<	int class_count = 0;          /* classes */
135	<	int users_invited_count = 0;  /* users invited */
136	<	int aways_counted = 0;
137	<	int number_ips_stored;        /* number of ip addresses hashed */
138	<
139	<	unsigned long channel_memory = 0;
140	<	size_t channel_ban_memory = 0;
141	<	size_t channel_except_memory = 0;
400	<	size_t channel_invex_memory = 0;
127	>	unsigned int channel_members = 0;
128	>	unsigned int channel_invites = 0;
129	>	unsigned int channel_bans = 0;
130	>	unsigned int channel_except = 0;
131	>	unsigned int channel_invex = 0;
132	>
133	>	unsigned int wwu = 0;                  /* whowas users */
134	>	unsigned int class_count = 0;          /* classes */
135	>	unsigned int aways_counted = 0;
136	>	unsigned int number_ips_stored;        /* number of ip addresses hashed */
137	>
138	>	uint64_t channel_memory = 0;
139	>	uint64_t channel_ban_memory = 0;
140	>	uint64_t channel_except_memory = 0;
141	>	uint64_t channel_invex_memory = 0;
142
143		unsigned int safelist_count = 0;
144	<	size_t safelist_memory = 0;
144	>	uint64_t safelist_memory = 0;
145	>
146	>	uint64_t wwm = 0;               /* whowas array memory used       */
147	>	uint64_t conf_memory = 0;       /* memory used by conf lines      */
148	>	uint64_t mem_ips_stored;        /* memory used by ip address hash */
149
150	<	unsigned long away_memory = 0;       /* memory used by aways           */
151	<	unsigned long wwm = 0;               /* whowas array memory used       */
407	<	unsigned long conf_memory = 0;       /* memory used by conf lines      */
408	<	unsigned long mem_ips_stored;        /* memory used by ip address hash */
409	<
410	<	unsigned long client_hash_table_size = 0;
411	<	unsigned long channel_hash_table_size = 0;
412	<	unsigned long resv_hash_table_size = 0;
413	<	unsigned long id_hash_table_size = 0;
414	<	unsigned long total_channel_memory = 0;
415	<	unsigned long totww = 0;
150	>	uint64_t total_channel_memory = 0;
151	>	uint64_t totww = 0;
152
153		unsigned int local_client_count  = 0;
154		unsigned int remote_client_count = 0;
155
156	<	unsigned int local_client_memory_used  = 0;
157	<	unsigned int remote_client_memory_used = 0;
156	>	uint64_t local_client_memory_used  = 0;
157	>	uint64_t remote_client_memory_used = 0;
158
159	<	unsigned long total_memory = 0;
159	>	uint64_t total_memory = 0;
160		unsigned int topic_count = 0;
161
162	<	count_whowas_memory(&wwu, &wwm);
162	>	unsigned int watch_list_headers = 0;   /* watchlist headers     */
163	>	unsigned int watch_list_entries = 0;   /* watchlist entries     */
164	>	uint64_t watch_list_memory = 0; /* watchlist memory used */
165	>
166
167		DLINK_FOREACH(gptr, global_client_list.head)
168		{
#	Line 433 | Line 172 | count_memory(struct Client *source_p)
172		{
173		++local_client_count;
174		local_client_conf_count += dlink_list_length(&target_p->localClient->confs);
175	+	watch_list_entries += dlink_list_length(&target_p->localClient->watches);
176		}
177		else
178		++remote_client_count;
#	Line 440 | Line 180 | count_memory(struct Client *source_p)
180		if (IsClient(target_p))
181		{
182		++users_counted;
443	–	users_invited_count += dlink_list_length(&target_p->invited);
183
184	<	if (target_p->away != NULL)
446	<	{
184	>	if (target_p->away[0])
185		++aways_counted;
448	–	away_memory += strlen(target_p->away) + 1;
449	–	}
186		}
187		}
188
#	Line 455 | Line 191 | count_memory(struct Client *source_p)
191		sizeof(struct Channel);
192		DLINK_FOREACH(gptr, global_channel_list.head)
193		{
194	<	struct Ban *actualBan;
195	<	struct Channel *chptr = gptr->data;
194	>	const struct Ban *actualBan;
195	>	const struct Channel *chptr = gptr->data;
196
197	<	channel_users   += dlink_list_length(&chptr->members);
197	>	channel_members += dlink_list_length(&chptr->members);
198		channel_invites += dlink_list_length(&chptr->invites);
199
200	<	if (chptr->topic != NULL)
200	>	if (chptr->topic[0])
201		++topic_count;
202
203	<	if ((channel_bans = dlink_list_length(&chptr->banlist)))
204	<	{
469	<	channel_ban_memory = channel_bans * sizeof(struct Ban);
203	>	channel_bans += dlink_list_length(&chptr->banlist);
204	>	channel_ban_memory += dlink_list_length(&chptr->banlist) * sizeof(struct Ban);
205
206	<	DLINK_FOREACH(dlink, chptr->banlist.head)
207	<	{
208	<	actualBan = dlink->data;
209	<	assert(actualBan->who);
206	>	DLINK_FOREACH(dlink, chptr->banlist.head)
207	>	{
208	>	actualBan = dlink->data;
209	>	assert(actualBan->who);
210
211	<	channel_ban_memory += actualBan->len + 3;
212	<	channel_ban_memory += strlen(actualBan->who) + 1;
478	<	}
211	>	channel_ban_memory += actualBan->len + 1;
212	>	channel_ban_memory += strlen(actualBan->who) + 1;
213		}
214
215	<	if ((channel_except = dlink_list_length(&chptr->exceptlist)))
216	<	{
483	<	channel_except_memory = channel_except * sizeof(struct Ban);
215	>	channel_except += dlink_list_length(&chptr->exceptlist);
216	>	channel_except_memory += dlink_list_length(&chptr->exceptlist) * sizeof(struct Ban);
217
218	<	DLINK_FOREACH(dlink, chptr->exceptlist.head)
219	<	{
220	<	actualBan = dlink->data;
221	<	assert(actualBan->who);
218	>	DLINK_FOREACH(dlink, chptr->exceptlist.head)
219	>	{
220	>	actualBan = dlink->data;
221	>	assert(actualBan->who);
222
223	<	channel_except_memory += actualBan->len + 3;
224	<	channel_except_memory += strlen(actualBan->who) + 1;
492	<	}
223	>	channel_except_memory += actualBan->len + 1;
224	>	channel_except_memory += strlen(actualBan->who) + 1;
225		}
226
227	<	if ((channel_invex = dlink_list_length(&chptr->invexlist)))
228	<	{
497	<	channel_invex_memory = channel_invex * sizeof(struct Ban);
227	>	channel_invex += dlink_list_length(&chptr->invexlist);
228	>	channel_invex_memory += dlink_list_length(&chptr->invexlist) * sizeof(struct Ban);
229
230	<	DLINK_FOREACH(dlink, chptr->invexlist.head)
231	<	{
232	<	actualBan = dlink->data;
233	<	assert(actualBan->who);
230	>	DLINK_FOREACH(dlink, chptr->invexlist.head)
231	>	{
232	>	actualBan = dlink->data;
233	>	assert(actualBan->who);
234
235	<	channel_invex_memory += actualBan->len + 3;
236	<	channel_invex_memory += strlen(actualBan->who) + 1;
506	<	}
235	>	channel_invex_memory += actualBan->len + 1;
236	>	channel_invex_memory += strlen(actualBan->who) + 1;
237		}
238		}
239
#	Line 512 | Line 242 | count_memory(struct Client *source_p)
242		safelist_memory = safelist_count * sizeof(struct ListTask);
243		DLINK_FOREACH(gptr, listing_client_list.head)
244		{
245	<	struct Client *acptr = gptr->data;
245	>	const struct Client *acptr = gptr->data;
246
247		DLINK_FOREACH(dlink, acptr->localClient->list_task->show_mask.head)
248		safelist_memory += strlen(dlink->data);
#	Line 537 | Line 267 | count_memory(struct Client *source_p)
267		/* count up all classes */
268		class_count = dlink_list_length(&class_items);
269
270	<	sendto_one(source_p, ":%s %d %s z :Clients %u(%lu) Invites %u(%lu)",
270	>	count_whowas_memory(&wwu, &wwm);
271	>	watch_count_memory(&watch_list_headers, &watch_list_memory);
272	>
273	>	sendto_one(source_p, ":%s %d %s z :WATCH headers %u(%u) entries %d(%u)",
274	>	me.name, RPL_STATSDEBUG, source_p->name, watch_list_headers,
275	>	watch_list_memory, watch_list_entries,
276	>	watch_list_entries * sizeof(dlink_node) * 2);
277	>
278	>	sendto_one(source_p, ":%s %d %s z :Clients %u(%u)",
279		me.name, RPL_STATSDEBUG, source_p->name, users_counted,
280	<	(unsigned long)(users_counted * sizeof(struct Client)),
543	<	users_invited_count, (unsigned long)(users_invited_count * sizeof(dlink_node)));
280	>	(users_counted * sizeof(struct Client)));
281
282	<	sendto_one(source_p, ":%s %d %s z :User aways %u(%d)",
282	>	sendto_one(source_p, ":%s %d %s z :User aways %u",
283		me.name, RPL_STATSDEBUG, source_p->name,
284	<	aways_counted, (int)away_memory);
284	>	aways_counted);
285
286	<	sendto_one(source_p, ":%s %d %s z :Attached confs %u(%lu)",
286	>	sendto_one(source_p, ":%s %d %s z :Attached confs %u(%llu)",
287		me.name, RPL_STATSDEBUG, source_p->name,
288		local_client_conf_count,
289	<	(unsigned long)(local_client_conf_count * sizeof(dlink_node)));
553	<
554	<	/* XXX  ConfigItemList fix */
555	<	#if 0
556	<	sendto_one(source_p, ":%s %d %s z :Conflines %lu(%d)",
557	<	me.name, RPL_STATSDEBUG, source_p->name,
558	<	dlink_list_length(&ConfigItemList), (int) conf_memory);
559	<	#endif
289	>	(unsigned long long)(local_client_conf_count * sizeof(dlink_node)));
290
291	<	sendto_one(source_p, ":%s %d %s z :Resv channels %lu(%lu) nicks %lu(%lu)",
291	>	sendto_one(source_p, ":%s %d %s z :Resv channels %u(%lu) nicks %u(%lu)",
292		me.name, RPL_STATSDEBUG, source_p->name,
293		dlink_list_length(&resv_channel_list),
294		dlink_list_length(&resv_channel_list) * sizeof(struct ResvChannel),
295		dlink_list_length(&nresv_items),
296		dlink_list_length(&nresv_items) * sizeof(struct MatchItem));
297
298	<	sendto_one(source_p, ":%s %d %s z :Classes %u(%lu)",
298	>	sendto_one(source_p, ":%s %d %s z :Classes %u(%llu)",
299		me.name, RPL_STATSDEBUG, source_p->name,
300	<	class_count, (unsigned long)(class_count * sizeof(struct ClassItem)));
300	>	class_count, (unsigned long long)(class_count * sizeof(struct ClassItem)));
301
302	<	sendto_one(source_p, ":%s %d %s z :Channels %lu(%lu) Topics %u(%d)",
302	>	sendto_one(source_p, ":%s %d %s z :Channels %uu(%llu) Topics %u(%u)",
303		me.name, RPL_STATSDEBUG, source_p->name,
304		dlink_list_length(&global_channel_list),
305		channel_memory, topic_count, topic_count *
306		(TOPICLEN + 1 + USERHOST_REPLYLEN));
307
308	<	sendto_one(source_p, ":%s %d %s z :Bans %u(%u)",
308	>	sendto_one(source_p, ":%s %d %s z :Bans %u(%llu)",
309		me.name, RPL_STATSDEBUG, source_p->name,
310		channel_bans, channel_ban_memory);
311
312	<	sendto_one(source_p, ":%s %d %s z :Exceptions %u(%u)",
312	>	sendto_one(source_p, ":%s %d %s z :Exceptions %u(%llu)",
313		me.name, RPL_STATSDEBUG, source_p->name,
314		channel_except, channel_except_memory);
315
316	<	sendto_one(source_p, ":%s %d %s z :Invex %u(%u)",
316	>	sendto_one(source_p, ":%s %d %s z :Invex %u(%llu)",
317		me.name, RPL_STATSDEBUG, source_p->name,
318		channel_invex, channel_invex_memory);
319
320	<	sendto_one(source_p, ":%s %d %s z :Channel members %u(%lu) invite %u(%lu)",
321	<	me.name, RPL_STATSDEBUG, source_p->name, channel_users,
322	<	(unsigned long)(channel_users * sizeof(struct Membership)),
323	<	channel_invites, (unsigned long)channel_invites *
324	<	sizeof(dlink_node));
320	>	sendto_one(source_p, ":%s %d %s z :Channel members %u(%llu) invites %u(%llu)",
321	>	me.name, RPL_STATSDEBUG, source_p->name, channel_members,
322	>	(unsigned long long)(channel_members * sizeof(struct Membership)),
323	>	channel_invites, (unsigned long long)channel_invites *
324	>	sizeof(dlink_node) * 2);
325
326		total_channel_memory = channel_memory + channel_ban_memory +
327	<	channel_users * sizeof(struct Membership) +
328	<	channel_invites * sizeof(dlink_node);
327	>	channel_members * sizeof(struct Membership) +
328	>	(channel_invites * sizeof(dlink_node)*2);
329
330	<	sendto_one(source_p, ":%s %d %s z :Safelist %u(%u)",
330	>	sendto_one(source_p, ":%s %d %s z :Safelist %u(%llu)",
331		me.name, RPL_STATSDEBUG, source_p->name,
332		safelist_count, safelist_memory);
333
334	<	sendto_one(source_p, ":%s %d %s z :Whowas users %u(%lu)",
334	>	sendto_one(source_p, ":%s %d %s z :Whowas users %u(%llu)",
335		me.name, RPL_STATSDEBUG, source_p->name,
336	<	wwu, (unsigned long)(wwu * sizeof(struct Client)));
336	>	wwu, (unsigned long long)(wwu * sizeof(struct Client)));
337
338	<	sendto_one(source_p, ":%s %d %s z :Whowas array %u(%d)",
338	>	sendto_one(source_p, ":%s %d %s z :Whowas array %u(%llu)",
339		me.name, RPL_STATSDEBUG, source_p->name,
340	<	NICKNAMEHISTORYLENGTH, (int)wwm);
340	>	NICKNAMEHISTORYLENGTH, wwm);
341
342		totww = wwu * sizeof(struct Client) + wwm;
613	–	/****
614	–	client_hash_table_size  = hash_get_client_table_size();
615	–	channel_hash_table_size = hash_get_channel_table_size();
616	–	resv_hash_table_size    = hash_get_resv_table_size();
617	–	id_hash_table_size      = hash_get_id_table_size();
343
619	–	sendto_one(source_p, ":%s %d %s z :Hash: client %u(%lu) chan %u(%lu) resv "
620	–	"%u(%lu) id %u(%lu)",
621	–	me.name, RPL_STATSDEBUG, source_p->name,
622	–	U_MAX, client_hash_table_size,
623	–	CH_MAX, channel_hash_table_size , R_MAX,
624	–	resv_hash_table_size, U_MAX, id_hash_table_size);
625	–	****/
344		count_ip_hash(&number_ips_stored,&mem_ips_stored);
345	<	sendto_one(source_p, ":%s %d %s z :iphash %u(%d)",
345	>	sendto_one(source_p, ":%s %d %s z :iphash %u(%llu)",
346		me.name, RPL_STATSDEBUG, source_p->name,
347	<	number_ips_stored, (int)mem_ips_stored);
347	>	number_ips_stored, mem_ips_stored);
348
349		total_memory = totww + total_channel_memory + conf_memory + class_count *
350		sizeof(struct ClassItem);
351	<	total_memory += client_hash_table_size;
352	<	total_memory += channel_hash_table_size;
353	<	total_memory += resv_hash_table_size;
636	<	total_memory += id_hash_table_size;
637	<
638	<	sendto_one(source_p, ":%s %d %s z :Total: whowas %d channel %d conf %d",
639	<	me.name, RPL_STATSDEBUG, source_p->name, (int)totww,
640	<	(int)total_channel_memory, (int)conf_memory);
351	>	sendto_one(source_p, ":%s %d %s z :Total: whowas %llu channel %llu conf %llu",
352	>	me.name, RPL_STATSDEBUG, source_p->name, totww,
353	>	total_channel_memory, conf_memory);
354
355		local_client_memory_used = local_client_count*(sizeof(struct Client) + sizeof(struct LocalUser));
356		total_memory += local_client_memory_used;
357	<	sendto_one(source_p, ":%s %d %s z :Local client Memory in use: %d(%d)",
357	>	sendto_one(source_p, ":%s %d %s z :Local client Memory in use: %u(%llu)",
358		me.name, RPL_STATSDEBUG, source_p->name, local_client_count,
359		local_client_memory_used);
360
361		remote_client_memory_used = remote_client_count * sizeof(struct Client);
362		total_memory += remote_client_memory_used;
363	<	sendto_one(source_p, ":%s %d %s z :Remote client Memory in use: %d(%d)",
363	>	sendto_one(source_p, ":%s %d %s z :Remote client Memory in use: %u(%llu)",
364		me.name, RPL_STATSDEBUG, source_p->name, remote_client_count,
365		remote_client_memory_used);
366
367		block_heap_report_stats(source_p);
368
369		sendto_one(source_p,
370	<	":%s %d %s z :TOTAL: %d Available:  Current max RSS: %lu",
370	>	":%s %d %s z :TOTAL: %llu",
371		me.name, RPL_STATSDEBUG, source_p->name,
372	<	(int)total_memory, get_maxrss());
372	>	total_memory);
373		}
374
375		static void
#	Line 666 | Line 379 | stats_dns_servers(struct Client *source_
379		}
380
381		static void
382	<	stats_connect(struct Client *source_p)
382	>	stats_connect(struct Client *source_p, int parc, char *parv[])
383		{
384	<	report_confitem_types(source_p, SERVER_TYPE, 0);
384	>	report_confitem_types(source_p, SERVER_TYPE);
385		}
386
387		/* stats_deny()
#	Line 678 | Line 391 | stats_connect(struct Client *source_p)
391		* side effects - client is given dline list.
392		*/
393		static void
394	<	stats_deny(struct Client *source_p)
394	>	stats_deny(struct Client *source_p, int parc, char *parv[])
395		{
683	–	struct AddressRec *arec;
396		struct ConfItem *conf;
397		struct AccessItem *aconf;
398	<	int i;
398	>	dlink_node *ptr = NULL;
399	>	unsigned int i = 0;
400
401	<	for (i = 0; i < ATABLE_SIZE; i++)
401	>
402	>	for (i = 0; i < ATABLE_SIZE; ++i)
403		{
404	<	for (arec = atable[i]; arec; arec=arec->next)
404	>	DLINK_FOREACH(ptr, atable[i].head)
405		{
406	+	struct AddressRec *arec = ptr->data;
407	+
408		if (arec->type == CONF_DLINE)
409		{
410		aconf = arec->aconf;
#	Line 701 | Line 417 | stats_deny(struct Client *source_p)
417
418		sendto_one(source_p, form_str(RPL_STATSDLINE),
419		from, to, 'D', aconf->host, aconf->reason,
420	<	aconf->oper_reason);
420	>	aconf->oper_reason ? aconf->oper_reason : "");
421		}
422		}
423		}
#	Line 714 | Line 430 | stats_deny(struct Client *source_p)
430		* side effects - client is given dline list.
431		*/
432		static void
433	<	stats_tdeny(struct Client *source_p)
433	>	stats_tdeny(struct Client *source_p, int parc, char *parv[])
434		{
719	–	struct AddressRec *arec;
435		struct ConfItem *conf;
436		struct AccessItem *aconf;
437	<	int i;
437	>	dlink_node *ptr = NULL;
438	>	unsigned int i = 0;
439
440	<	for (i = 0; i < ATABLE_SIZE; i++)
440	>
441	>	for (i = 0; i < ATABLE_SIZE; ++i)
442		{
443	<	for (arec = atable[i]; arec; arec=arec->next)
443	>	DLINK_FOREACH(ptr, atable[i].head)
444		{
445	+	struct AddressRec *arec = ptr->data;
446	+
447		if (arec->type == CONF_DLINE)
448		{
449		aconf = arec->aconf;
#	Line 737 | Line 456 | stats_tdeny(struct Client *source_p)
456
457		sendto_one(source_p, form_str(RPL_STATSDLINE),
458		from, to, 'd', aconf->host, aconf->reason,
459	<	aconf->oper_reason);
459	>	aconf->oper_reason ? aconf->oper_reason : "");
460		}
461		}
462		}
#	Line 750 | Line 469 | stats_tdeny(struct Client *source_p)
469		* side effects - client is given list of exempt blocks
470		*/
471		static void
472	<	stats_exempt(struct Client *source_p)
472	>	stats_exempt(struct Client *source_p, int parc, char *parv[])
473		{
755	–	struct AddressRec *arec;
474		struct ConfItem *conf;
475		struct AccessItem *aconf;
476	<	int i;
476	>	dlink_node *ptr = NULL;
477	>	unsigned int i = 0;
478
479	<	for (i = 0; i < ATABLE_SIZE; i++)
479	>	if (ConfigFileEntry.stats_e_disabled)
480		{
481	<	for (arec = atable[i]; arec; arec=arec->next)
481	>	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
482	>	from, to);
483	>	return;
484	>	}
485	>
486	>
487	>	for (i = 0; i < ATABLE_SIZE; ++i)
488	>	{
489	>	DLINK_FOREACH(ptr, atable[i].head)
490		{
491	+	struct AddressRec *arec = ptr->data;
492	+
493		if (arec->type == CONF_EXEMPTDLINE)
494		{
495		aconf = arec->aconf;
#	Line 769 | Line 498 | stats_exempt(struct Client *source_p)
498
499		sendto_one(source_p, form_str(RPL_STATSDLINE),
500		from, to, 'e', aconf->host,
501	<	aconf->reason, aconf->oper_reason);
501	>	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
502		}
503		}
504		}
505		}
506
507		static void
508	<	stats_events(struct Client *source_p)
508	>	stats_events(struct Client *source_p, int parc, char *parv[])
509		{
510		show_events(source_p);
511		}
#	Line 788 | Line 517 | stats_events(struct Client *source_p)
517		* side effects - client is shown list of pending glines
518		*/
519		static void
520	<	stats_pending_glines(struct Client *source_p)
520	>	stats_pending_glines(struct Client *source_p, int parc, char *parv[])
521		{
522	<	#ifdef GLINE_VOTING
523	<	dlink_node *pending_node;
524	<	struct gline_pending *glp_ptr;
525	<	char timebuffer[MAX_DATE_STRING];
797	<	struct tm *tmptr;
522	>	const dlink_node *dn_ptr = NULL;
523	>	const struct gline_pending *glp_ptr = NULL;
524	>	char timebuffer[MAX_DATE_STRING] = { '\0' };
525	>	struct tm *tmptr = NULL;
526
527		if (!ConfigFileEntry.glines)
528		{
#	Line 803 | Line 531 | stats_pending_glines(struct Client *sour
531		return;
532		}
533
534	<	if (dlink_list_length(&pending_glines) > 0)
534	>	if (dlink_list_length(&pending_glines[GLINE_PENDING_ADD_TYPE]) > 0)
535		sendto_one(source_p, ":%s NOTICE %s :Pending G-lines",
536		from, to);
537
538	<	DLINK_FOREACH(pending_node, pending_glines.head)
538	>	DLINK_FOREACH(dn_ptr, pending_glines[GLINE_PENDING_ADD_TYPE].head)
539		{
540	<	glp_ptr = pending_node->data;
541	<	tmptr   = localtime(&glp_ptr->time_request1);
540	>	glp_ptr = dn_ptr->data;
541	>	tmptr   = localtime(&glp_ptr->vote_1.time_request);
542		strftime(timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
543
544		sendto_one(source_p,
545		":%s NOTICE %s :1) %s!%s@%s on %s requested gline at %s for %s@%s [%s]",
546	<	from, to, glp_ptr->oper_nick1,
547	<	glp_ptr->oper_user1, glp_ptr->oper_host1,
548	<	glp_ptr->oper_server1, timebuffer,
549	<	glp_ptr->user, glp_ptr->host, glp_ptr->reason1);
546	>	from, to, glp_ptr->vote_1.oper_nick,
547	>	glp_ptr->vote_1.oper_user, glp_ptr->vote_1.oper_host,
548	>	glp_ptr->vote_1.oper_server, timebuffer,
549	>	glp_ptr->user, glp_ptr->host, glp_ptr->vote_1.reason);
550
551	<	if (glp_ptr->oper_nick2[0] != '\0')
551	>	if (glp_ptr->vote_2.oper_nick[0] != '\0')
552		{
553	<	tmptr = localtime(&glp_ptr->time_request2);
553	>	tmptr = localtime(&glp_ptr->vote_2.time_request);
554		strftime(timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
555		sendto_one(source_p,
556		":%s NOTICE %s :2) %s!%s@%s on %s requested gline at %s for %s@%s [%s]",
557	<	from, to, glp_ptr->oper_nick2,
558	<	glp_ptr->oper_user2, glp_ptr->oper_host2,
559	<	glp_ptr->oper_server2, timebuffer,
560	<	glp_ptr->user, glp_ptr->host, glp_ptr->reason2);
557	>	from, to, glp_ptr->vote_2.oper_nick,
558	>	glp_ptr->vote_2.oper_user, glp_ptr->vote_2.oper_host,
559	>	glp_ptr->vote_2.oper_server, timebuffer,
560	>	glp_ptr->user, glp_ptr->host, glp_ptr->vote_2.reason);
561		}
562		}
563
564		sendto_one(source_p, ":%s NOTICE %s :End of Pending G-lines",
565		from, to);
566	<	#else
567	<	sendto_one(source_p, ":%s NOTICE %s :This server does not support G-Line voting",
566	>
567	>	if (dlink_list_length(&pending_glines[GLINE_PENDING_DEL_TYPE]) > 0)
568	>	sendto_one(source_p, ":%s NOTICE %s :Pending UNG-lines",
569	>	from, to);
570	>
571	>	DLINK_FOREACH(dn_ptr, pending_glines[GLINE_PENDING_DEL_TYPE].head)
572	>	{
573	>	glp_ptr = dn_ptr->data;
574	>	tmptr   = localtime(&glp_ptr->vote_1.time_request);
575	>	strftime(timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
576	>
577	>	sendto_one(source_p,
578	>	":%s NOTICE %s :1) %s!%s@%s on %s requested ungline at %s for %s@%s [%s]",
579	>	from, to, glp_ptr->vote_1.oper_nick,
580	>	glp_ptr->vote_1.oper_user, glp_ptr->vote_1.oper_host,
581	>	glp_ptr->vote_1.oper_server, timebuffer,
582	>	glp_ptr->user, glp_ptr->host, glp_ptr->vote_1.reason);
583	>
584	>	if (glp_ptr->vote_2.oper_nick[0] != '\0')
585	>	{
586	>	tmptr = localtime(&glp_ptr->vote_2.time_request);
587	>	strftime(timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
588	>	sendto_one(source_p,
589	>	":%s NOTICE %s :2) %s!%s@%s on %s requested ungline at %s for %s@%s [%s]",
590	>	from, to, glp_ptr->vote_2.oper_nick,
591	>	glp_ptr->vote_2.oper_user, glp_ptr->vote_2.oper_host,
592	>	glp_ptr->vote_2.oper_server, timebuffer,
593	>	glp_ptr->user, glp_ptr->host, glp_ptr->vote_2.reason);
594	>
595	>	}
596	>	}
597	>
598	>	sendto_one(source_p, ":%s NOTICE %s :End of Pending UNG-lines",
599		from, to);
841	–	#endif /* GLINE VOTING */
600		}
601
602		/* stats_glines()
#	Line 848 | Line 606 | stats_pending_glines(struct Client *sour
606		* side effects - client is shown list of glines
607		*/
608		static void
609	<	stats_glines(struct Client *source_p)
609	>	stats_glines(struct Client *source_p, int parc, char *parv[])
610		{
611	<	struct AddressRec *arec = NULL;
612	<	int i = 0;
611	>	dlink_node *ptr = NULL;
612	>	unsigned int i = 0;
613
614		if (!ConfigFileEntry.glines)
615		{
#	Line 860 | Line 618 | stats_glines(struct Client *source_p)
618		return;
619		}
620
621	<	for (; i < ATABLE_SIZE; ++i)
621	>	for (i = 0; i < ATABLE_SIZE; ++i)
622		{
623	<	for (arec = atable[i]; arec; arec=arec->next)
623	>	DLINK_FOREACH(ptr, atable[i].head)
624		{
625	+	const struct AddressRec *arec = ptr->data;
626	+
627		if (arec->type == CONF_GLINE)
628		{
629		const struct AccessItem *aconf = arec->aconf;
#	Line 878 | Line 638 | stats_glines(struct Client *source_p)
638		}
639		}
640
641	<	/* stats_gdeny()
641	>	static void
642	>	stats_hubleaf(struct Client *source_p, int parc, char *parv[])
643	>	{
644	>	report_confitem_types(source_p, HUB_TYPE);
645	>	report_confitem_types(source_p, LEAF_TYPE);
646	>	}
647	>
648	>	/*
649	>	* show_iline_prefix()
650		*
651	<	* input        - client pointer
652	<	* outputs      - none
653	<	* side effects - client is shown gline ACL
651	>	* inputs       - pointer to struct Client requesting output
652	>	*              - pointer to struct AccessItem
653	>	*              - name to which iline prefix will be prefixed to
654	>	* output       - pointer to static string with prefixes listed in ascii form
655	>	* side effects - NONE
656		*/
657	<	static void
658	<	stats_gdeny(struct Client *source_p)
657	>	static const char *
658	>	show_iline_prefix(struct Client *sptr, struct AccessItem *aconf, const char *name)
659		{
660	<	if (!ConfigFileEntry.glines)
661	<	{
662	<	sendto_one(source_p, ":%s NOTICE %s :This server does not support G-Lines",
663	<	from, to);
664	<	return;
665	<	}
660	>	static char prefix_of_host[USERLEN + 14];
661	>	char *prefix_ptr = prefix_of_host;
662	>
663	>	if (IsNoTilde(aconf))
664	>	*prefix_ptr++ = '-';
665	>	if (IsLimitIp(aconf))
666	>	*prefix_ptr++ = '!';
667	>	if (IsNeedIdentd(aconf))
668	>	*prefix_ptr++ = '+';
669	>	if (!IsNeedPassword(aconf))
670	>	*prefix_ptr++ = '&';
671	>	if (IsConfExemptResv(aconf))
672	>	*prefix_ptr++ = '$';
673	>	if (IsNoMatchIp(aconf))
674	>	*prefix_ptr++ = '%';
675	>	if (IsConfDoSpoofIp(aconf))
676	>	*prefix_ptr++ = '=';
677	>	if (MyOper(sptr) && IsConfExemptKline(aconf))
678	>	*prefix_ptr++ = '^';
679	>	if (MyOper(sptr) && IsConfExemptGline(aconf))
680	>	*prefix_ptr++ = '_';
681	>	if (MyOper(sptr) && IsConfExemptLimits(aconf))
682	>	*prefix_ptr++ = '>';
683	>	if (IsConfCanFlood(aconf))
684	>	*prefix_ptr++ = '|';
685
686	<	report_confitem_types(source_p, GDENY_TYPE, 0);
686	>	strlcpy(prefix_ptr, name, USERLEN+1);
687	>
688	>	return prefix_of_host;
689		}
690
691		static void
692	<	stats_hubleaf(struct Client *source_p)
692	>	report_auth(struct Client *client_p, int parc, char *parv[])
693		{
694	<	report_confitem_types(source_p, HUB_TYPE, 0);
695	<	report_confitem_types(source_p, LEAF_TYPE, 0);
694	>	struct ConfItem *conf;
695	>	struct AccessItem *aconf;
696	>	dlink_node *ptr = NULL;
697	>	unsigned int i;
698	>
699	>
700	>	for (i = 0; i < ATABLE_SIZE; ++i)
701	>	{
702	>	DLINK_FOREACH(ptr, atable[i].head)
703	>	{
704	>	struct AddressRec *arec = ptr->data;
705	>
706	>	if (arec->type == CONF_CLIENT)
707	>	{
708	>	aconf = arec->aconf;
709	>
710	>	if (!MyOper(client_p) && IsConfDoSpoofIp(aconf))
711	>	continue;
712	>
713	>	conf = unmap_conf_item(aconf);
714	>
715	>	/* We are doing a partial list, based on what matches the u@h of the
716	>	* sender, so prepare the strings for comparing --fl_
717	>	*/
718	>	if (ConfigFileEntry.hide_spoof_ips)
719	>	sendto_one(client_p, form_str(RPL_STATSILINE), me.name,
720	>	client_p->name, 'I',
721	>	conf->name == NULL ? "*" : conf->name,
722	>	show_iline_prefix(client_p, aconf, aconf->user),
723	>	IsConfDoSpoofIp(aconf) ? "255.255.255.255" :
724	>	aconf->host, aconf->port,
725	>	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
726	>
727	>	else
728	>	sendto_one(client_p, form_str(RPL_STATSILINE), me.name,
729	>	client_p->name, 'I',
730	>	conf->name == NULL ? "*" : conf->name,
731	>	show_iline_prefix(client_p, aconf, aconf->user),
732	>	aconf->host, aconf->port,
733	>	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
734	>	}
735	>	}
736	>	}
737		}
738
739		static void
740	<	stats_auth(struct Client *source_p)
740	>	stats_auth(struct Client *source_p, int parc, char *parv[])
741		{
742		/* Oper only, if unopered, return ERR_NOPRIVILEGES */
743	<	if ((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper(source_p))
743	>	if ((ConfigFileEntry.stats_i_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
744		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
745		from, to);
746
747		/* If unopered, Only return matching auth blocks */
748	<	else if ((ConfigFileEntry.stats_i_oper_only == 1) && !IsOper(source_p))
748	>	else if ((ConfigFileEntry.stats_i_oper_only == 1) && !HasUMode(source_p, UMODE_OPER))
749		{
750		struct ConfItem *conf;
751		struct AccessItem *aconf;
#	Line 924 | Line 756 | stats_auth(struct Client *source_p)
756		CONF_CLIENT,
757		source_p->localClient->aftype,
758		source_p->username,
759	<	source_p->localClient->passwd);
759	>	source_p->localClient->passwd, 1);
760		else
761		aconf = find_conf_by_address(source_p->host, NULL, CONF_CLIENT,
762	<	0, source_p->username, NULL);
762	>	0, source_p->username, NULL, 1);
763
764		if (aconf == NULL)
765		return;
#	Line 942 | Line 774 | stats_auth(struct Client *source_p)
774		}
775		/* They are opered, or allowed to see all auth blocks */
776		else
777	<	report_auth(source_p);
777	>	report_auth(source_p, 0, NULL);
778		}
779
780	+	/* report_Klines()
781	+	* Inputs: Client to report to,
782	+	*         type(==0 for perm, !=0 for temporary)
783	+	*         mask
784	+	* Output: None
785	+	* Side effects: Reports configured K(or k)-lines to client_p.
786	+	*/
787		static void
788	<	stats_tklines(struct Client *source_p)
788	>	report_Klines(struct Client *client_p, int tkline)
789	>	{
790	>	struct AccessItem *aconf = NULL;
791	>	unsigned int i = 0;
792	>	const char *p = NULL;
793	>	dlink_node *ptr = NULL;
794	>
795	>	if (tkline)
796	>	p = "k";
797	>	else
798	>	p = "K";
799	>
800	>	for (i = 0; i < ATABLE_SIZE; ++i)
801	>	{
802	>	DLINK_FOREACH(ptr, atable[i].head)
803	>	{
804	>	struct AddressRec *arec = ptr->data;
805	>
806	>	if (arec->type == CONF_KLINE)
807	>	{
808	>	if ((tkline && !((aconf = arec->aconf)->flags & CONF_FLAGS_TEMPORARY)) ||
809	>	(!tkline && ((aconf = arec->aconf)->flags & CONF_FLAGS_TEMPORARY)))
810	>	continue;
811	>
812	>	if (HasUMode(client_p, UMODE_OPER))
813	>	sendto_one(client_p, form_str(RPL_STATSKLINE), me.name,
814	>	client_p->name, p, aconf->host, aconf->user,
815	>	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
816	>	else
817	>	sendto_one(client_p, form_str(RPL_STATSKLINE), me.name,
818	>	client_p->name, p, aconf->host, aconf->user,
819	>	aconf->reason, "");
820	>	}
821	>	}
822	>	}
823	>	}
824	>
825	>	static void
826	>	stats_tklines(struct Client *source_p, int parc, char *parv[])
827		{
951	–	struct ConfItem *conf;
828		/* Oper only, if unopered, return ERR_NOPRIVILEGES */
829	<	if ((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper(source_p))
829	>	if ((ConfigFileEntry.stats_k_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
830		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
831		from, to);
832
833		/* If unopered, Only return matching klines */
834	<	else if ((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper(source_p))
834	>	else if ((ConfigFileEntry.stats_k_oper_only == 1) && !HasUMode(source_p, UMODE_OPER))
835		{
836	<	struct AccessItem *aconf;
836	>	struct AccessItem *aconf = NULL;
837
838		if (MyConnect(source_p))
839		aconf = find_conf_by_address(source_p->host,
840		&source_p->localClient->ip,
841	<	CONF_KILL,
841	>	CONF_KLINE,
842		source_p->localClient->aftype,
843	<	source_p->username, NULL);
843	>	source_p->username, NULL, 1);
844		else
845	<	aconf = find_conf_by_address(source_p->host, NULL, CONF_KILL,
846	<	0, source_p->username, NULL);
845	>	aconf = find_conf_by_address(source_p->host, NULL, CONF_KLINE,
846	>	0, source_p->username, NULL, 1);
847
848		if (aconf == NULL)
849		return;
#	Line 976 | Line 852 | stats_tklines(struct Client *source_p)
852		if (!(aconf->flags & CONF_FLAGS_TEMPORARY))
853		return;
854
979	–	conf = unmap_conf_item(aconf);
980	–
855		sendto_one(source_p, form_str(RPL_STATSKLINE), from,
856		to, "k", aconf->host, aconf->user, aconf->reason, "");
857		}
858		/* Theyre opered, or allowed to see all klines */
859		else {
860		report_Klines(source_p, 1);
987	–	report_confitem_types(source_p, RKLINE_TYPE, 1);
861		}
862		}
863
864		static void
865	<	stats_klines(struct Client *source_p)
865	>	stats_klines(struct Client *source_p, int parc, char *parv[])
866		{
867		/* Oper only, if unopered, return ERR_NOPRIVILEGES */
868	<	if ((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper(source_p))
868	>	if ((ConfigFileEntry.stats_k_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
869		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
870		from, to);
871
872		/* If unopered, Only return matching klines */
873	<	else if ((ConfigFileEntry.stats_k_oper_only == 1) && !IsOper(source_p))
873	>	else if ((ConfigFileEntry.stats_k_oper_only == 1) && !HasUMode(source_p, UMODE_OPER))
874		{
875	<	struct AccessItem *aconf;
875	>	struct AccessItem *aconf = NULL;
876
877		/* search for a kline */
878	<	if(MyConnect(source_p))
878	>	if (MyConnect(source_p))
879		aconf = find_conf_by_address(source_p->host,
880		&source_p->localClient->ip,
881	<	CONF_KILL,
881	>	CONF_KLINE,
882		source_p->localClient->aftype,
883	<	source_p->username, NULL);
883	>	source_p->username, NULL, 0);
884		else
885	<	aconf = find_conf_by_address(source_p->host, NULL, CONF_KILL,
886	<	0, source_p->username, NULL);
885	>	aconf = find_conf_by_address(source_p->host, NULL, CONF_KLINE,
886	>	0, source_p->username, NULL, 0);
887
888	<	if(aconf == NULL)
888	>	if (aconf == NULL)
889		return;
890
891		/* dont report a tkline as a kline */
892	<	if(aconf->flags & CONF_FLAGS_TEMPORARY)
892	>	if (aconf->flags & CONF_FLAGS_TEMPORARY)
893		return;
894
895		sendto_one(source_p, form_str(RPL_STATSKLINE), from,
896	<	to, "K", aconf->host, aconf->user, aconf->reason,
1024	<	aconf->oper_reason);
896	>	to, "K", aconf->host, aconf->user, aconf->reason, "");
897		}
898		/* Theyre opered, or allowed to see all klines */
899		else {
900		report_Klines(source_p, 0);
901	<	report_confitem_types(source_p, RKLINE_TYPE, 0);
901	>	report_confitem_types(source_p, RKLINE_TYPE);
902		}
903		}
904
905		static void
906	<	stats_messages(struct Client *source_p)
906	>	stats_messages(struct Client *source_p, int parc, char *parv[])
907		{
908		report_messages(source_p);
909		}
910
911		static void
912	<	stats_oper(struct Client *source_p)
912	>	stats_oper(struct Client *source_p, int parc, char *parv[])
913		{
914	<	if (!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
914	>	if (!HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.stats_o_oper_only)
915		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
916		from, to);
917		else
918	<	report_confitem_types(source_p, OPER_TYPE, 0);
918	>	report_confitem_types(source_p, OPER_TYPE);
919		}
920
921		/* stats_operedup()
#	Line 1053 | Line 925 | stats_oper(struct Client *source_p)
925		* side effects - client is shown a list of active opers
926		*/
927		static void
928	<	stats_operedup(struct Client *source_p)
928	>	stats_operedup(struct Client *source_p, int parc, char *parv[])
929		{
930		dlink_node *ptr;
931
#	Line 1061 | Line 933 | stats_operedup(struct Client *source_p)
933		{
934		const struct Client *target_p = ptr->data;
935
936	<	if (IsOperHidden(target_p) && !IsOper(source_p))
936	>	if (HasUMode(target_p, UMODE_HIDDEN) && !HasUMode(source_p, UMODE_OPER))
937		continue;
938
939	<	if (MyClient(source_p) && IsOper(source_p))
939	>	if (MyClient(source_p) && HasUMode(source_p, UMODE_OPER))
940		sendto_one(source_p, ":%s %d %s p :[%c][%s] %s (%s@%s) Idle: %d",
941		from, RPL_STATSDEBUG, to,
942	<	IsAdmin(target_p) ?
1071	<	(IsOperHiddenAdmin(target_p) ? 'O' : 'A') : 'O',
942	>	HasUMode(target_p, UMODE_ADMIN) ? 'A' : 'O',
943		oper_privs_as_string(target_p->localClient->operflags),
944		target_p->name, target_p->username, target_p->host,
945	<	(int)(CurrentTime - target_p->localClient->last));
945	>	(int)(CurrentTime - target_p->localClient->last_privmsg));
946		else
947		sendto_one(source_p, ":%s %d %s p :[%c] %s (%s@%s) Idle: %d",
948		from, RPL_STATSDEBUG, to,
949	<	IsAdmin(target_p) ?
1079	<	(IsOperHiddenAdmin(target_p) ? 'O' : 'A') : 'O',
949	>	HasUMode(target_p, UMODE_ADMIN) ? 'A' : 'O',
950		target_p->name, target_p->username, target_p->host,
951	<	(int)(CurrentTime - target_p->localClient->last));
951	>	(int)(CurrentTime - target_p->localClient->last_privmsg));
952		}
953
954		sendto_one(source_p, ":%s %d %s p :%lu OPER(s)",
#	Line 1086 | Line 956 | stats_operedup(struct Client *source_p)
956		}
957
958		static void
959	<	stats_ports(struct Client *source_p)
959	>	stats_ports(struct Client *source_p, int parc, char *parv[])
960		{
961	<	if (!IsOper(source_p) && ConfigFileEntry.stats_P_oper_only)
961	>	if (!HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.stats_P_oper_only)
962		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
963		from, to);
964		else
#	Line 1096 | Line 966 | stats_ports(struct Client *source_p)
966		}
967
968		static void
969	<	stats_resv(struct Client *source_p)
969	>	stats_resv(struct Client *source_p, int parc, char *parv[])
970		{
971		report_resv(source_p);
972		}
973
974		static void
975	<	stats_usage(struct Client *source_p)
975	>	stats_service(struct Client *source_p, int parc, char *parv[])
976		{
977	<	send_usage(source_p);
977	>	report_confitem_types(source_p, SERVICE_TYPE);
978		}
979
980		static void
981	<	stats_tstats(struct Client *source_p)
981	>	stats_tstats(struct Client *source_p, int parc, char *parv[])
982		{
983	<	tstats(source_p);
983	>	const struct Client *target_p = NULL;
984	>	const dlink_node *ptr = NULL;
985	>	struct ServerStatistics *sp;
986	>	struct ServerStatistics tmp;
987	>
988	>	sp = &tmp;
989	>	memcpy(sp, &ServerStats, sizeof(struct ServerStatistics));
990	>
991	>	/*
992	>	* must use the += operator. is_sv is not the number of currently
993	>	* active server connections. Note the incrementation in
994	>	* s_bsd.c:close_connection.
995	>	*/
996	>	sp->is_sv += dlink_list_length(&serv_list);
997	>
998	>	DLINK_FOREACH(ptr, serv_list.head)
999	>	{
1000	>	target_p = ptr->data;
1001	>
1002	>	sp->is_sbs += target_p->localClient->send.bytes;
1003	>	sp->is_sbr += target_p->localClient->recv.bytes;
1004	>	sp->is_sti += CurrentTime - target_p->localClient->firsttime;
1005	>	}
1006	>
1007	>	sp->is_cl += dlink_list_length(&local_client_list);
1008	>
1009	>	DLINK_FOREACH(ptr, local_client_list.head)
1010	>	{
1011	>	target_p = ptr->data;
1012	>
1013	>	sp->is_cbs += target_p->localClient->send.bytes;
1014	>	sp->is_cbr += target_p->localClient->recv.bytes;
1015	>	sp->is_cti += CurrentTime - target_p->localClient->firsttime;
1016	>	}
1017	>
1018	>	sp->is_ni += dlink_list_length(&unknown_list);
1019	>
1020	>	sendto_one(source_p, ":%s %d %s T :accepts %u refused %u",
1021	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_ac, sp->is_ref);
1022	>	sendto_one(source_p, ":%s %d %s T :unknown commands %u prefixes %u",
1023	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_unco, sp->is_unpf);
1024	>	sendto_one(source_p, ":%s %d %s T :nick collisions %u unknown closes %u",
1025	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_kill, sp->is_ni);
1026	>	sendto_one(source_p, ":%s %d %s T :wrong direction %u empty %u",
1027	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_wrdi, sp->is_empt);
1028	>	sendto_one(source_p, ":%s %d %s T :numerics seen %u",
1029	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_num);
1030	>	sendto_one(source_p, ":%s %d %s T :auth successes %u fails %u",
1031	>	me.name, RPL_STATSDEBUG, source_p->name, sp->is_asuc, sp->is_abad);
1032	>	sendto_one(source_p, ":%s %d %s T :Client Server",
1033	>	me.name, RPL_STATSDEBUG, source_p->name);
1034	>
1035	>	sendto_one(source_p, ":%s %d %s T :connected %u %u",
1036	>	me.name, RPL_STATSDEBUG, source_p->name,
1037	>	(unsigned int)sp->is_cl,
1038	>	(unsigned int)sp->is_sv);
1039	>	sendto_one(source_p, ":%s %d %s T :bytes sent %llu %llu",
1040	>	me.name, RPL_STATSDEBUG, source_p->name,
1041	>	sp->is_cbs, sp->is_sbs);
1042	>	sendto_one(source_p, ":%s %d %s T :bytes recv %llu %llu",
1043	>	me.name, RPL_STATSDEBUG, source_p->name,
1044	>	sp->is_cbr, sp->is_sbr);
1045	>	sendto_one(source_p, ":%s %d %s T :time connected %u %u",
1046	>	me.name, RPL_STATSDEBUG, source_p->name,
1047	>	(unsigned int)sp->is_cti,
1048	>	(unsigned int)sp->is_sti);
1049		}
1050
1051		static void
1052	<	stats_uptime(struct Client *source_p)
1052	>	stats_uptime(struct Client *source_p, int parc, char *parv[])
1053		{
1054	<	time_t now = CurrentTime - me.since;
1054	>	time_t now = CurrentTime - me.localClient->since;
1055	>
1056		sendto_one(source_p, form_str(RPL_STATSUPTIME), from, to,
1057	<	now/86400, (now/3600)%24, (now/60)%60, now%60);
1058	<	if (!ConfigFileEntry.disable_remote || IsOper(source_p))
1057	>	now / 86400, (now / 3600) % 24, (now / 60) % 60, now % 60);
1058	>
1059	>	if (!ConfigFileEntry.disable_remote || HasUMode(source_p, UMODE_OPER))
1060		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
1061	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
1061	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
1062		}
1063
1064		static void
1065	<	stats_shared(struct Client *source_p)
1065	>	stats_shared(struct Client *source_p, int parc, char *parv[])
1066		{
1067	<	report_confitem_types(source_p, ULINE_TYPE, 0);
1067	>	report_confitem_types(source_p, ULINE_TYPE);
1068		}
1069
1070		/* stats_servers()
#	Line 1137 | Line 1074 | stats_shared(struct Client *source_p)
1074		* side effects - client is shown lists of who connected servers
1075		*/
1076		static void
1077	<	stats_servers(struct Client *source_p)
1077	>	stats_servers(struct Client *source_p, int parc, char *parv[])
1078		{
1079	<	struct Client *target_p;
1143	<	dlink_node *ptr;
1144	<	int j = 0;
1079	>	dlink_node *ptr = NULL;
1080
1081		DLINK_FOREACH(ptr, serv_list.head)
1082		{
1083	<	target_p = ptr->data;
1149	<
1150	<	j++;
1083	>	const struct Client *target_p = ptr->data;
1084
1085		sendto_one(source_p, ":%s %d %s v :%s (%s!%s@%s) Idle: %d",
1086	<	from, RPL_STATSDEBUG, to,
1087	<	target_p->name,
1088	<	(target_p->serv->by[0] ? target_p->serv->by : "Remote."),
1156	<	"*", "*", (int)(CurrentTime - target_p->lasttime));
1086	>	from, RPL_STATSDEBUG, to, target_p->name,
1087	>	(target_p->serv->by[0] ? target_p->serv->by : "Remote."),
1088	>	"*", "*", (int)(CurrentTime - target_p->localClient->lasttime));
1089		}
1090
1091	<	sendto_one(source_p, ":%s %d %s v :%d Server(s)",
1092	<	from, RPL_STATSDEBUG, to, j);
1161	<	}
1162	<
1163	<	static void
1164	<	stats_gecos(struct Client *source_p)
1165	<	{
1166	<	report_confitem_types(source_p, XLINE_TYPE, 0);
1167	<	report_confitem_types(source_p, RXLINE_TYPE, 0);
1091	>	sendto_one(source_p, ":%s %d %s v :%u Server(s)",
1092	>	from, RPL_STATSDEBUG, to, dlink_list_length(&serv_list));
1093		}
1094
1095		static void
1096	<	stats_class(struct Client *source_p)
1096	>	stats_gecos(struct Client *source_p, int parc, char *parv[])
1097		{
1098	<	report_confitem_types(source_p, CLASS_TYPE, 0);
1098	>	report_confitem_types(source_p, XLINE_TYPE);
1099	>	report_confitem_types(source_p, RXLINE_TYPE);
1100		}
1101
1102		static void
1103	<	stats_memory(struct Client *source_p)
1103	>	stats_class(struct Client *source_p, int parc, char *parv[])
1104		{
1105	<	count_memory(source_p);
1105	>	report_confitem_types(source_p, CLASS_TYPE);
1106		}
1107
1108		static void
1109	<	stats_ziplinks(struct Client *source_p)
1184	<	{
1185	<	dlink_node *ptr;
1186	<	struct Client *target_p;
1187	<	unsigned int sent_data = 0;
1188	<
1189	<	DLINK_FOREACH(ptr, serv_list.head)
1190	<	{
1191	<	target_p = ptr->data;
1192	<
1193	<	if (IsCapable(target_p, CAP_ZIP))
1194	<	{
1195	<	/* we use memcpy(3) and a local copy of the structure to
1196	<	* work around a register use bug on GCC on the SPARC.
1197	<	* -jmallett, 04/27/2002
1198	<	*/
1199	<	struct ZipStats zipstats;
1200	<	memcpy(&zipstats, &target_p->localClient->zipstats, sizeof (struct ZipStats));
1201	<
1202	<	sendto_one(source_p, ":%s %d %s Z :ZipLinks stats for %s send[%.2f%% "
1203	<	"compression (%lu bytes data/%lu bytes wire)] recv[%.2f%% "
1204	<	"compression (%lu bytes data/%lu bytes wire)]",
1205	<	from, RPL_STATSDEBUG, to, target_p->name,
1206	<	zipstats.out_ratio, zipstats.out, zipstats.out_wire,
1207	<	zipstats.in_ratio,  zipstats.in,  zipstats.in_wire);
1208	<	++sent_data;
1209	<	}
1210	<	}
1211	<
1212	<	sendto_one(source_p, ":%s %d %s Z :%u ziplink(s)",
1213	<	from, RPL_STATSDEBUG, to, sent_data);
1214	<	}
1215	<
1216	<	static void
1217	<	stats_servlinks(struct Client *source_p)
1109	>	stats_servlinks(struct Client *source_p, int parc, char *parv[])
1110		{
1111		uint64_t sendB = 0, recvB = 0;
1112		time_t uptime = 0;
1113	<	int j = 0;
1222	<	struct Client *target_p = NULL;
1223	<	dlink_node *ptr;
1113	>	dlink_node *ptr = NULL;
1114
1115	<	if (ConfigServerHide.flatten_links && !IsOper(source_p))
1115	>	if (ConfigServerHide.flatten_links && !HasUMode(source_p, UMODE_OPER))
1116		{
1117		sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
1118		from, to);
#	Line 1231 | Line 1121 | stats_servlinks(struct Client *source_p)
1121
1122		DLINK_FOREACH(ptr, serv_list.head)
1123		{
1124	<	target_p = ptr->data;
1124	>	struct Client *target_p = ptr->data;
1125
1236	–	++j;
1126		sendB += target_p->localClient->send.bytes;
1127		recvB += target_p->localClient->recv.bytes;
1128
1129		/* ":%s 211 %s %s %u %u %llu %u %llu :%u %u %s" */
1130		sendto_one(source_p, form_str(RPL_STATSLINKINFO),
1131		from, to,
1132	<	get_client_name(target_p, IsAdmin(source_p) ? SHOW_IP : MASK_IP),
1132	>	get_client_name(target_p, HasUMode(source_p, UMODE_ADMIN) ? SHOW_IP : MASK_IP),
1133		dbuf_length(&target_p->localClient->buf_sendq),
1134		target_p->localClient->send.messages,
1135		target_p->localClient->send.bytes >> 10,
1136		target_p->localClient->recv.messages,
1137		target_p->localClient->recv.bytes >> 10,
1138	<	(unsigned)(CurrentTime - target_p->firsttime),
1139	<	(CurrentTime > target_p->since) ? (unsigned)(CurrentTime - target_p->since): 0,
1140	<	IsOper(source_p) ? show_capabilities(target_p) : "TS");
1138	>	(unsigned)(CurrentTime - target_p->localClient->firsttime),
1139	>	(CurrentTime > target_p->localClient->since) ? (unsigned)(CurrentTime - target_p->localClient->since): 0,
1140	>	HasUMode(source_p, UMODE_OPER) ? show_capabilities(target_p) : "TS");
1141		}
1142
1143		sendB >>= 10;
1144		recvB >>= 10;
1145
1146		sendto_one(source_p, ":%s %d %s ? :%u total server(s)",
1147	<	from, RPL_STATSDEBUG, to, j);
1147	>	from, RPL_STATSDEBUG, to, dlink_list_length(&serv_list));
1148		sendto_one(source_p, ":%s %d %s ? :Sent total : %7.2f %s",
1149		from, RPL_STATSDEBUG, to,
1150	<	_GMKv((signed)sendB), _GMKs((signed)sendB));
1150	>	_GMKv(sendB), _GMKs(sendB));
1151		sendto_one(source_p, ":%s %d %s ? :Recv total : %7.2f %s",
1152		from, RPL_STATSDEBUG, to,
1153	<	_GMKv((signed)recvB), _GMKs((signed)recvB));
1153	>	_GMKv(recvB), _GMKs(recvB));
1154
1155	<	uptime = (CurrentTime - me.since);
1155	>	uptime = (CurrentTime - me.localClient->since);
1156
1157		sendto_one(source_p, ":%s %d %s ? :Server send: %7.2f %s (%4.1f K/s)",
1158		from, RPL_STATSDEBUG, to,
1159	<	_GMKv((signed)(me.localClient->send.bytes>>10)),
1160	<	_GMKs((signed)(me.localClient->send.bytes>>10)),
1161	<	(float)((float)(((signed)me.localClient->send.bytes) >> 10) /
1162	<	(float)uptime));
1159	>	_GMKv((me.localClient->send.bytes>>10)),
1160	>	_GMKs((me.localClient->send.bytes>>10)),
1161	>	(float)((float)((me.localClient->send.bytes) >> 10) /
1162	>	(float)uptime));
1163		sendto_one(source_p, ":%s %d %s ? :Server recv: %7.2f %s (%4.1f K/s)",
1164		from, RPL_STATSDEBUG, to,
1165	<	_GMKv((signed)(me.localClient->recv.bytes>>10)),
1166	<	_GMKs((signed)(me.localClient->recv.bytes>>10)),
1167	<	(float)((float)(((signed)me.localClient->recv.bytes) >> 10) /
1168	<	(float)uptime));
1165	>	_GMKv((me.localClient->recv.bytes>>10)),
1166	>	_GMKs((me.localClient->recv.bytes>>10)),
1167	>	(float)((float)((me.localClient->recv.bytes) >> 10) /
1168	>	(float)uptime));
1169		}
1170
1171	<	static void
1172	<	stats_ltrace(struct Client *source_p, int parc, char *parv[])
1171	>	/* parse_stats_args()
1172	>	*
1173	>	* inputs       - arg count
1174	>	*              - args
1175	>	*              - doall flag
1176	>	*              - wild card or not
1177	>	* output       - pointer to name to use
1178	>	* side effects -
1179	>	* common parse routine for m_stats args
1180	>	*
1181	>	*/
1182	>	static char *
1183	>	parse_stats_args(int parc, char *parv[], int *doall, int *wilds)
1184		{
1185	<	int doall = 0;
1286	<	int wilds = 0;
1287	<	char *name = NULL;
1288	<	char statchar;
1185	>	char *name;
1186
1187	<	if ((name = parse_stats_args(parc, parv, &doall, &wilds)) != NULL)
1187	>	if (parc > 2)
1188		{
1189	<	statchar = parv[1][0];
1189	>	name = parv[2];
1190
1191	<	stats_L(source_p, name, doall, wilds, statchar);
1192	<	}
1193	<	else
1194	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1298	<	from, to, "STATS");
1299	<	}
1191	>	if (!irccmp(name, from))
1192	>	*doall = 2;
1193	>	else if (match(name, from))
1194	>	*doall = 1;
1195
1196	<	/*
1302	<	* ms_stats - STATS message handler
1303	<	*      parv[0] = sender prefix
1304	<	*      parv[1] = statistics selector (defaults to Message frequency)
1305	<	*      parv[2] = server name (current server defaulted, if omitted)
1306	<	*/
1307	<	static void
1308	<	ms_stats(struct Client *client_p, struct Client *source_p,
1309	<	int parc, char *parv[])
1310	<	{
1311	<	if (hunt_server(client_p,source_p,":%s STATS %s :%s",2,parc,parv)!=HUNTED_ISME)
1312	<	return;
1196	>	*wilds = has_wildcards(name);
1197
1198	<	if (IsClient(source_p))
1199	<	mo_stats(client_p, source_p, parc, parv);
1316	<	}
1198	>	return name;
1199	>	}
1200
1201	<	/*
1319	<	* stats_L
1320	<	*
1321	<	* inputs       - pointer to client to report to
1322	<	*              - doall flag
1323	<	*              - wild card or not
1324	<	* output       - NONE
1325	<	* side effects -
1326	<	*/
1327	<	static void
1328	<	stats_L(struct Client *source_p,char *name,int doall,
1329	<	int wilds,char statchar)
1330	<	{
1331	<	stats_L_list(source_p, name, doall, wilds, &unknown_list, statchar);
1332	<	stats_L_list(source_p, name, doall, wilds, &local_client_list, statchar);
1333	<	stats_L_list(source_p, name, doall, wilds, &serv_list, statchar);
1201	>	return NULL;
1202		}
1203
1204		static void
#	Line 1350 | Line 1218 | stats_L_list(struct Client *source_p,cha
1218		{
1219		target_p = ptr->data;
1220
1221	<	if (IsInvisible(target_p) && (doall || wilds) &&
1222	<	!(MyConnect(source_p) && IsOper(source_p)) &&
1223	<	!IsOper(target_p) && (target_p != source_p))
1221	>	if (HasUMode(target_p, UMODE_INVISIBLE) && (doall || wilds) &&
1222	>	!(MyConnect(source_p) && HasUMode(source_p, UMODE_OPER)) &&
1223	>	!HasUMode(target_p, UMODE_OPER) && (target_p != source_p))
1224		continue;
1225		if (!doall && wilds && !match(name, target_p->name))
1226		continue;
#	Line 1361 | Line 1229 | stats_L_list(struct Client *source_p,cha
1229
1230		/* This basically shows ips for our opers if its not a server/admin, or
1231		* its one of our admins.  */
1232	<	if(MyClient(source_p) && IsOper(source_p) &&
1233	<	(IsAdmin(source_p) ||
1234	<	(!IsServer(target_p) && !IsAdmin(target_p) &&
1232	>	if(MyClient(source_p) && HasUMode(source_p, UMODE_OPER) &&
1233	>	(HasUMode(source_p, UMODE_ADMIN) ||
1234	>	(!IsServer(target_p) && !HasUMode(target_p, UMODE_ADMIN) &&
1235		!IsHandshake(target_p) && !IsConnecting(target_p))))
1236		{
1237		sendto_one(source_p, form_str(RPL_STATSLINKINFO),
1238	<	from, to,
1238	>	from, to,
1239		(IsUpper(statchar)) ?
1240		get_client_name(target_p, SHOW_IP) :
1241		get_client_name(target_p, HIDE_IP),
#	Line 1376 | Line 1244 | stats_L_list(struct Client *source_p,cha
1244		target_p->localClient->send.bytes>>10,
1245		target_p->localClient->recv.messages,
1246		target_p->localClient->recv.bytes>>10,
1247	<	(unsigned)(CurrentTime - target_p->firsttime),
1248	<	(CurrentTime > target_p->since) ? (unsigned)(CurrentTime - target_p->since):0,
1247	>	(unsigned)(CurrentTime - target_p->localClient->firsttime),
1248	>	(CurrentTime > target_p->localClient->since) ? (unsigned)(CurrentTime - target_p->localClient->since):0,
1249		IsServer(target_p) ? show_capabilities(target_p) : "-");
1250		}
1251		else
1252		{
1253		/* If its a hidden ip, an admin, or a server, mask the real IP */
1254	<	if(IsIPSpoof(target_p) || IsServer(target_p) || IsAdmin(target_p)
1254	>	if(IsIPSpoof(target_p) || IsServer(target_p) || HasUMode(target_p, UMODE_ADMIN)
1255		|| IsHandshake(target_p) || IsConnecting(target_p))
1256		sendto_one(source_p, form_str(RPL_STATSLINKINFO),
1257		from, to,
1258	<	get_client_name(target_p, MASK_IP),
1259	<	dbuf_length(&target_p->localClient->buf_sendq),
1260	<	target_p->localClient->send.messages,
1261	<	target_p->localClient->send.bytes>>10,
1262	<	target_p->localClient->recv.messages,
1263	<	target_p->localClient->recv.bytes>>10,
1264	<	(unsigned)(CurrentTime - target_p->firsttime),
1265	<	(CurrentTime > target_p->since) ? (unsigned)(CurrentTime - target_p->since):0,
1266	<	IsServer(target_p) ? show_capabilities(target_p) : "-");
1258	>	get_client_name(target_p, MASK_IP),
1259	>	dbuf_length(&target_p->localClient->buf_sendq),
1260	>	target_p->localClient->send.messages,
1261	>	target_p->localClient->send.bytes>>10,
1262	>	target_p->localClient->recv.messages,
1263	>	target_p->localClient->recv.bytes>>10,
1264	>	(unsigned)(CurrentTime - target_p->localClient->firsttime),
1265	>	(CurrentTime > target_p->localClient->since) ? (unsigned)(CurrentTime - target_p->localClient->since):0,
1266	>	IsServer(target_p) ? show_capabilities(target_p) : "-");
1267		else /* show the real IP */
1268		sendto_one(source_p, form_str(RPL_STATSLINKINFO),
1269		from, to,
1270	<	(IsUpper(statchar)) ?
1271	<	get_client_name(target_p, SHOW_IP) :
1272	<	get_client_name(target_p, HIDE_IP),
1273	<	dbuf_length(&target_p->localClient->buf_sendq),
1274	<	target_p->localClient->send.messages,
1275	<	target_p->localClient->send.bytes>>10,
1276	<	target_p->localClient->recv.messages,
1277	<	target_p->localClient->recv.bytes>>10,
1278	<	(unsigned)(CurrentTime - target_p->firsttime),
1279	<	(CurrentTime > target_p->since) ? (unsigned)(CurrentTime - target_p->since):0,
1280	<	IsServer(target_p) ? show_capabilities(target_p) : "-");
1270	>	(IsUpper(statchar)) ?
1271	>	get_client_name(target_p, SHOW_IP) :
1272	>	get_client_name(target_p, HIDE_IP),
1273	>	dbuf_length(&target_p->localClient->buf_sendq),
1274	>	target_p->localClient->send.messages,
1275	>	target_p->localClient->send.bytes>>10,
1276	>	target_p->localClient->recv.messages,
1277	>	target_p->localClient->recv.bytes>>10,
1278	>	(unsigned)(CurrentTime - target_p->localClient->firsttime),
1279	>	(CurrentTime > target_p->localClient->since) ? (unsigned)(CurrentTime - target_p->localClient->since):0,
1280	>	IsServer(target_p) ? show_capabilities(target_p) : "-");
1281		}
1282		}
1283		}
1284
1285	<	/* parse_stats_args()
1285	>	/*
1286	>	* stats_L
1287		*
1288	<	* inputs       - arg count
1289	<	*              - args
1290	<	*              - doall flag
1291	<	*              - wild card or not
1292	<	* output       - pointer to name to use
1293	<	* side effects -
1294	<	* common parse routine for m_stats args
1288	>	* inputs       - pointer to client to report to
1289	>	*              - doall flag
1290	>	*              - wild card or not
1291	>	* output       - NONE
1292	>	* side effects -
1293	>	*/
1294	>	static void
1295	>	stats_L(struct Client *source_p,char *name,int doall,
1296	>	int wilds,char statchar)
1297	>	{
1298	>	stats_L_list(source_p, name, doall, wilds, &unknown_list, statchar);
1299	>	stats_L_list(source_p, name, doall, wilds, &local_client_list, statchar);
1300	>	stats_L_list(source_p, name, doall, wilds, &serv_list, statchar);
1301	>	}
1302	>
1303	>	static void
1304	>	stats_ltrace(struct Client *source_p, int parc, char *parv[])
1305	>	{
1306	>	int doall = 0;
1307	>	int wilds = 0;
1308	>	char *name = NULL;
1309	>	char statchar;
1310	>
1311	>	if ((name = parse_stats_args(parc, parv, &doall, &wilds)) != NULL)
1312	>	{
1313	>	statchar = parv[1][0];
1314	>
1315	>	stats_L(source_p, name, doall, wilds, statchar);
1316	>	}
1317	>	else
1318	>	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1319	>	from, to, "STATS");
1320	>	}
1321	>
1322	>	static const struct StatsStruct
1323	>	{
1324	>	const unsigned char letter;
1325	>	void (*handler)();
1326	>	const unsigned int need_oper;
1327	>	const unsigned int need_admin;
1328	>	} stats_cmd_table[] = {
1329	>	/* letter     function            need_oper need_admin */
1330	>	{ 'a',        stats_dns_servers,      1,      1       },
1331	>	{ 'A',        stats_dns_servers,      1,      1       },
1332	>	{ 'c',        stats_connect,          1,      0       },
1333	>	{ 'C',        stats_connect,          1,      0       },
1334	>	{ 'd',        stats_tdeny,            1,      0       },
1335	>	{ 'D',        stats_deny,             1,      0       },
1336	>	{ 'e',        stats_exempt,           1,      0       },
1337	>	{ 'E',        stats_events,           1,      1       },
1338	>	{ 'f',        fd_dump,                1,      1       },
1339	>	{ 'F',        fd_dump,                1,      1       },
1340	>	{ 'g',        stats_pending_glines,   1,      0       },
1341	>	{ 'G',        stats_glines,           1,      0       },
1342	>	{ 'h',        stats_hooks,            1,      1       },
1343	>	{ 'H',        stats_hubleaf,          1,      0       },
1344	>	{ 'i',        stats_auth,             0,      0       },
1345	>	{ 'I',        stats_auth,             0,      0       },
1346	>	{ 'k',        stats_tklines,          0,      0       },
1347	>	{ 'K',        stats_klines,           0,      0       },
1348	>	{ 'l',        stats_ltrace,           1,      0       },
1349	>	{ 'L',        stats_ltrace,           1,      0       },
1350	>	{ 'm',        stats_messages,         0,      0       },
1351	>	{ 'M',        stats_messages,         0,      0       },
1352	>	{ 'o',        stats_oper,             0,      0       },
1353	>	{ 'O',        stats_oper,             0,      0       },
1354	>	{ 'p',        stats_operedup,         0,      0       },
1355	>	{ 'P',        stats_ports,            0,      0       },
1356	>	{ 'q',        stats_resv,             1,      0       },
1357	>	{ 'Q',        stats_resv,             1,      0       },
1358	>	{ 'r',        stats_usage,            1,      0       },
1359	>	{ 'R',        stats_usage,            1,      0       },
1360	>	{ 'S',        stats_service,          1,      0       },
1361	>	{ 't',        stats_tstats,           1,      0       },
1362	>	{ 'T',        stats_tstats,           1,      0       },
1363	>	{ 'u',        stats_uptime,           0,      0       },
1364	>	{ 'U',        stats_shared,           1,      0       },
1365	>	{ 'v',        stats_servers,          1,      0       },
1366	>	{ 'x',        stats_gecos,            1,      0       },
1367	>	{ 'X',        stats_gecos,            1,      0       },
1368	>	{ 'y',        stats_class,            1,      0       },
1369	>	{ 'Y',        stats_class,            1,      0       },
1370	>	{ 'z',        stats_memory,           1,      0       },
1371	>	{ '?',        stats_servlinks,        0,      0       },
1372	>	{ '\0',       NULL,                   0,      0       }
1373	>	};
1374	>
1375	>	static void
1376	>	do_stats(struct Client *source_p, int parc, char *parv[])
1377	>	{
1378	>	const struct StatsStruct *tab = stats_cmd_table;
1379	>	const char statchar = *parv[1];
1380	>
1381	>	if (statchar == '\0')
1382	>	{
1383	>	sendto_one(source_p, form_str(RPL_ENDOFSTATS),
1384	>	from, to, '*');
1385	>	return;
1386	>	}
1387	>
1388	>	for (; tab->handler; ++tab)
1389	>	{
1390	>	if (tab->letter == statchar)
1391	>	{
1392	>	/* The stats table says what privs are needed, so check --fl_ */
1393	>	if ((tab->need_admin && !HasUMode(source_p, UMODE_ADMIN)) ||
1394	>	(tab->need_oper && !HasUMode(source_p, UMODE_OPER)))
1395	>	{
1396	>	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
1397	>	from, to);
1398	>	break;
1399	>	}
1400	>
1401	>	sendto_realops_flags(UMODE_SPY, L_ALL,
1402	>	"STATS %c requested by %s (%s@%s) [%s]",
1403	>	statchar, source_p->name, source_p->username,
1404	>	source_p->host, source_p->servptr->name);
1405	>	tab->handler(source_p, parc, parv);
1406	>	break;
1407	>	}
1408	>	}
1409	>
1410	>	sendto_one(source_p, form_str(RPL_ENDOFSTATS),
1411	>	from, to, statchar);
1412	>	}
1413	>
1414	>	/*
1415	>	* m_stats()
1416	>	*      parv[0] = sender prefix
1417	>	*      parv[1] = stat letter/command
1418	>	*      parv[2] = (if present) server/mask in stats L
1419		*
1420	+	* This will search the tables for the appropriate stats letter/command,
1421	+	* if found execute it.
1422		*/
1423	<	static char *
1424	<	parse_stats_args(int parc, char *parv[], int *doall, int *wilds)
1423	>	static void
1424	>	m_stats(struct Client *client_p, struct Client *source_p,
1425	>	int parc, char *parv[])
1426		{
1427	<	char *name;
1427	>	static time_t last_used = 0;
1428
1429	<	if (parc > 2)
1429	>	/* Is the stats meant for us? */
1430	>	if (!ConfigFileEntry.disable_remote)
1431	>	if (hunt_server(client_p, source_p, ":%s STATS %s :%s", 2,
1432	>	parc, parv) != HUNTED_ISME)
1433	>	return;
1434	>
1435	>	if (!MyClient(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
1436		{
1437	<	name = parv[2];
1437	>	from = me.id;
1438	>	to = source_p->id;
1439	>	}
1440	>	else
1441	>	{
1442	>	from = me.name;
1443	>	to = source_p->name;
1444	>	}
1445
1446	<	if (!irccmp(name, from))
1447	<	*doall = 2;
1448	<	else if (match(name, from))
1449	<	*doall = 1;
1446	>	/* Check the user is actually allowed to do /stats, and isnt flooding */
1447	>	if ((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
1448	>	{
1449	>	sendto_one(source_p,form_str(RPL_LOAD2HI),
1450	>	from, to);
1451	>	return;
1452	>	}
1453	>
1454	>	last_used = CurrentTime;
1455
1456	<	if (strchr(name, '*') ||
1457	<	strchr(name, '?'))
1444	<	*wilds = 1;
1456	>	do_stats(source_p, parc, parv);
1457	>	}
1458
1459	<	return(name);
1459	>	/*
1460	>	* mo_stats()
1461	>	*      parv[0] = sender prefix
1462	>	*      parv[1] = stat letter/command
1463	>	*      parv[2] = (if present) server/mask in stats L, or target
1464	>	*
1465	>	* This will search the tables for the appropriate stats letter,
1466	>	* if found execute it.
1467	>	*/
1468	>	static void
1469	>	mo_stats(struct Client *client_p, struct Client *source_p,
1470	>	int parc, char *parv[])
1471	>	{
1472	>	if (hunt_server(client_p, source_p, ":%s STATS %s :%s", 2,
1473	>	parc, parv) != HUNTED_ISME)
1474	>	return;
1475	>
1476	>	if (!MyClient(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
1477	>	{
1478	>	from = me.id;
1479	>	to = source_p->id;
1480		}
1481		else
1482	<	return(NULL);
1482	>	{
1483	>	from = me.name;
1484	>	to = source_p->name;
1485	>	}
1486	>
1487	>	do_stats(source_p, parc, parv);
1488		}
1489	+
1490	+	/*
1491	+	* ms_stats - STATS message handler
1492	+	*      parv[0] = sender prefix
1493	+	*      parv[1] = statistics selector (defaults to Message frequency)
1494	+	*      parv[2] = server name (current server defaulted, if omitted)
1495	+	*/
1496	+	static void
1497	+	ms_stats(struct Client *client_p, struct Client *source_p,
1498	+	int parc, char *parv[])
1499	+	{
1500	+	if (hunt_server(client_p, source_p, ":%s STATS %s :%s", 2,
1501	+	parc, parv) != HUNTED_ISME)
1502	+	return;
1503	+
1504	+	if (IsClient(source_p))
1505	+	mo_stats(client_p, source_p, parc, parv);
1506	+	}
1507	+
1508	+	static struct Message stats_msgtab = {
1509	+	"STATS", 0, 0, 2, MAXPARA, MFLG_SLOW, 0,
1510	+	{ m_unregistered, m_stats, ms_stats, m_ignore, mo_stats, m_ignore }
1511	+	};
1512	+
1513	+	static void
1514	+	module_init(void)
1515	+	{
1516	+	mod_add_cmd(&stats_msgtab);
1517	+	}
1518	+
1519	+	static void
1520	+	module_exit(void)
1521	+	{
1522	+	mod_del_cmd(&stats_msgtab);
1523	+	}
1524	+
1525	+	struct module module_entry = {
1526	+	.node    = { NULL, NULL, NULL },
1527	+	.name    = NULL,
1528	+	.version = "$Revision$",
1529	+	.handle  = NULL,
1530	+	.modinit = module_init,
1531	+	.modexit = module_exit,
1532	+	.flags   = 0
1533	+	};

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)