projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide /stats F to report even defaulted feature values.
[ircu2.10.12-pk.git]
/
ircd
/
s_stats.c
diff --git
a/ircd/s_stats.c
b/ircd/s_stats.c
index 6b390aae3f1d4f3c40738ca0b7b560f42c75beb8..c3f01cd7c43abc0e64b5c2c5fe01dc748d253a47 100644
(file)
--- a/
ircd/s_stats.c
+++ b/
ircd/s_stats.c
@@
-43,6
+43,7
@@
#include "numnicks.h"
#include "querycmds.h"
#include "res.h"
#include "numnicks.h"
#include "querycmds.h"
#include "res.h"
+#include "s_auth.h"
#include "s_bsd.h"
#include "s_conf.h"
#include "s_debug.h"
#include "s_bsd.h"
#include "s_conf.h"
#include "s_debug.h"
@@
-109,6
+110,7
@@
stats_configured_links(struct Client *sptr, const struct StatDesc* sd,
send_reply(sptr, RPL_STATSCLINE, name, port, maximum, hub_limit, get_conf_class(tmp));
else if (tmp->status & CONF_CLIENT)
send_reply(sptr, RPL_STATSILINE,
send_reply(sptr, RPL_STATSCLINE, name, port, maximum, hub_limit, get_conf_class(tmp));
else if (tmp->status & CONF_CLIENT)
send_reply(sptr, RPL_STATSILINE,
+ (tmp->username ? tmp->username : ""), (tmp->username ? "@" : ""),
(tmp->host ? tmp->host : "*"), maximum,
(name[0] == ':' ? "0" : ""), (tmp->name ? tmp->name : "*"),
port, get_conf_class(tmp));
(tmp->host ? tmp->host : "*"), maximum,
(name[0] == ':' ? "0" : ""), (tmp->name ? tmp->name : "*"),
port, get_conf_class(tmp));
@@
-183,6
+185,7
@@
stats_access(struct Client *to, const struct StatDesc *sd, char *param)
|| (aconf->name && !match(param, aconf->name))))
{
send_reply(to, RPL_STATSILINE,
|| (aconf->name && !match(param, aconf->name))))
{
send_reply(to, RPL_STATSILINE,
+ (aconf->username ? aconf->username : ""), (aconf->username ? "@" : ""),
(aconf->host ? aconf->host : "*"), aconf->maximum,
(aconf->name && aconf->name[0] == ':' ? "0":""),
aconf->name ? aconf->name : "*",
(aconf->host ? aconf->host : "*"), aconf->maximum,
(aconf->name && aconf->name[0] == ':' ? "0":""),
aconf->name ? aconf->name : "*",
@@
-455,9
+458,9
@@
stats_servers_verbose(struct Client* sptr, const struct StatDesc* sd,
"%-20s %-20s Flags Hops Numeric Lag RTT Up Down "
"Clients/Max Proto %-10s :Info", "Servername", "Uplink",
"LinkTS");
"%-20s %-20s Flags Hops Numeric Lag RTT Up Down "
"Clients/Max Proto %-10s :Info", "Servername", "Uplink",
"LinkTS");
- fmt = "%-20s %-20s %c%c%c%c %4i %s %-4i %5i %4i %4i %4i %5i %5i P%-2i %Tu :%s";
+ fmt = "%-20s %-20s %c%c%c%c
%c
%4i %s %-4i %5i %4i %4i %4i %5i %5i P%-2i %Tu :%s";
} else {
} else {
- fmt = "%s %s %c%c%c%c %i %s %i %i %i %i %i %i %i P%i %Tu :%s";
+ fmt = "%s %s %c%c%c%c
%c
%i %s %i %i %i %i %i %i %i P%i %Tu :%s";
}
for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr))
}
for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr))
@@
-474,6
+477,7
@@
stats_servers_verbose(struct Client* sptr, const struct StatDesc* sd,
IsBurstAck(acptr) ? 'A' : '-',
IsHub(acptr) ? 'H' : '-',
IsService(acptr) ? 'S' : '-',
IsBurstAck(acptr) ? 'A' : '-',
IsHub(acptr) ? 'H' : '-',
IsService(acptr) ? 'S' : '-',
+ IsIPv6(acptr) ? '6' : '-',
cli_hopcount(acptr),
NumServ(acptr),
base64toint(cli_yxx(acptr)),
cli_hopcount(acptr),
NumServ(acptr),
base64toint(cli_yxx(acptr)),
@@
-525,7
+529,7
@@
stats_help(struct Client* to, const struct StatDesc* sd, char* param)
/** Contains information about all statistics. */
struct StatDesc statsinfo[] = {
/** Contains information about all statistics. */
struct StatDesc statsinfo[] = {
- { 'a', "nameservers", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_a,
+ { 'a', "nameservers", STAT_FLAG_OPERFEAT
|STAT_FLAG_LOCONLY
, FEAT_HIS_STATS_a,
report_dns_servers, 0,
"DNS servers." },
{ 'c', "connect", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_c,
report_dns_servers, 0,
"DNS servers." },
{ 'c', "connect", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_c,
@@
-540,9
+544,12
@@
struct StatDesc statsinfo[] = {
{ 'e', "engine", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_e,
stats_engine, 0,
"Report server event loop engine." },
{ 'e', "engine", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_e,
stats_engine, 0,
"Report server event loop engine." },
- { 'f', "features",
STAT_FLAG_OPERFEAT
, FEAT_HIS_STATS_f,
+ { 'f', "features",
(STAT_FLAG_OPERFEAT | STAT_FLAG_CASESENS)
, FEAT_HIS_STATS_f,
feature_report, 0,
"Feature settings." },
feature_report, 0,
"Feature settings." },
+ { 'F', "featuresall", (STAT_FLAG_OPERFEAT | STAT_FLAG_CASESENS), FEAT_HIS_STATS_f,
+ feature_report, 1,
+ "All feature settings, including defaulted values." },
{ 'g', "glines", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_g,
gline_stats, 0,
"Global bans (G-lines)." },
{ 'g', "glines", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_g,
gline_stats, 0,
"Global bans (G-lines)." },
@@
-616,6
+623,12
@@
struct StatDesc statsinfo[] = {
{ 'z', "memory", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_z,
count_memory, 0,
"Memory/Structure allocation information." },
{ 'z', "memory", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_z,
count_memory, 0,
"Memory/Structure allocation information." },
+ { ' ', "iauth", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_IAUTH,
+ report_iauth_stats, 0,
+ "IAuth statistics." },
+ { ' ', "iauthconf", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_IAUTH,
+ report_iauth_conf, 0,
+ "IAuth configuration." },
{ '*', "help", STAT_FLAG_CASESENS, FEAT_LAST_F,
stats_help, 0,
"Send help for stats." },
{ '*', "help", STAT_FLAG_CASESENS, FEAT_LAST_F,
stats_help, 0,
"Send help for stats." },