#include "stdinc.h"
#include "class.h" /* report_classes */
#include "client.h" /* Client */
-#include "common.h"
#include "match.h"
#include "ircd.h" /* me */
#include "listener.h" /* show_ports */
#include "s_serv.h" /* hunt_server */
#include "s_stats.h"
#include "s_user.h" /* show_opers */
-#include "blacklist.h" /* dnsbl stuff */
#include "parse.h"
#include "modules.h"
#include "hook.h"
#include "whowas.h"
#include "rb_radixtree.h"
#include "sslproc.h"
+#include "s_assert.h"
-static int m_stats (struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static const char stats_desc[] =
"Provides the STATS command to inspect various server/network information";
+static void m_stats (struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
struct Message stats_msgtab = {
- "STATS", 0, 0, 0, 0,
+ "STATS", false, false, false, false,
{mg_unreg, {m_stats, 2}, {m_stats, 3}, mg_ignore, mg_ignore, {m_stats, 2}}
};
const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
-static void stats_l_list(struct Client *s, const char *, int, int, rb_dlink_list *, char,
- int (*check_fn)(struct Client *target_p));
+static void stats_l_list(struct Client *s, const char *, bool, bool, rb_dlink_list *, char,
+ bool (*check_fn)(struct Client *target_p));
static void stats_l_client(struct Client *source_p, struct Client *target_p,
char statchar);
static int stats_spy(struct Client *, char, const char *);
static void stats_p_spy(struct Client *);
-/* Heres our struct for the stats table */
+typedef void (*handler_t)(struct Client *source_p);
+typedef void (*handler_parv_t)(struct Client *source_p, int parc, const char *parv[]);
+
struct stats_cmd
{
- void (*handler) (struct Client *source_p);
- int need_oper;
- int need_admin;
+ union
+ {
+ handler_t handler;
+ handler_parv_t handler_parv;
+ };
+ bool need_parv;
+ bool need_oper;
+ bool need_admin;
};
static void stats_dns_servers(struct Client *);
static void stats_comm(struct Client *);
static void stats_capability(struct Client *);
+#define HANDLER_NORM(fn, oper, admin) { { .handler = fn }, false, oper, admin }
+#define HANDLER_PARV(fn, oper, admin) { { .handler_parv = fn }, true, oper, admin }
+
/* This table contains the possible stats items, in order:
* stats letter, function to call, operonly? adminonly? --fl_
*
* Previously in this table letters were a column. I fixed it to use modern
- * C initalisers so we don't have to iterate anymore.
+ * C initalisers so we don't have to iterate anymore
* --Elizafox
*/
-static struct stats_cmd stats_cmd_table[255] = {
- /* letter function need_oper need_admin */
- ['a'] = { stats_dns_servers, 1, 1, },
- ['A'] = { stats_dns_servers, 1, 1, },
- ['b'] = { stats_delay, 1, 1, },
- ['B'] = { stats_hash, 1, 1, },
- ['c'] = { stats_connect, 0, 0, },
- ['C'] = { stats_capability, 1, 0, },
- ['d'] = { stats_tdeny, 1, 0, },
- ['D'] = { stats_deny, 1, 0, },
- ['e'] = { stats_exempt, 1, 0, },
- ['E'] = { stats_events, 1, 1, },
- ['f'] = { stats_comm, 1, 1, },
- ['F'] = { stats_comm, 1, 1, },
- ['g'] = { stats_prop_klines, 1, 0, },
- ['h'] = { stats_hubleaf, 0, 0, },
- ['H'] = { stats_hubleaf, 0, 0, },
- ['i'] = { stats_auth, 0, 0, },
- ['I'] = { stats_auth, 0, 0, },
- ['k'] = { stats_tklines, 0, 0, },
- ['K'] = { stats_klines, 0, 0, },
- ['l'] = { NULL /* special */, 0, 0, },
- ['L'] = { NULL /* special */, 0, 0, },
- ['m'] = { stats_messages, 0, 0, },
- ['M'] = { stats_messages, 0, 0, },
- ['n'] = { stats_dnsbl, 0, 0, },
- ['o'] = { stats_oper, 0, 0, },
- ['O'] = { stats_privset, 1, 0, },
- ['p'] = { stats_operedup, 0, 0, },
- ['P'] = { stats_ports, 0, 0, },
- ['q'] = { stats_tresv, 1, 0, },
- ['Q'] = { stats_resv, 1, 0, },
- ['r'] = { stats_usage, 1, 0, },
- ['R'] = { stats_usage, 1, 0, },
- ['s'] = { stats_ssld, 1, 1, },
- ['S'] = { stats_ssld, 1, 1, },
- ['t'] = { stats_tstats, 1, 0, },
- ['T'] = { stats_tstats, 1, 0, },
- ['u'] = { stats_uptime, 0, 0, },
- ['U'] = { stats_shared, 1, 0, },
- ['v'] = { stats_servers, 0, 0, },
- ['V'] = { stats_servers, 0, 0, },
- ['x'] = { stats_tgecos, 1, 0, },
- ['X'] = { stats_gecos, 1, 0, },
- ['y'] = { stats_class, 0, 0, },
- ['Y'] = { stats_class, 0, 0, },
- ['z'] = { stats_memory, 1, 0, },
- ['Z'] = { stats_ziplinks, 1, 0, },
- ['?'] = { stats_servlinks, 0, 0, },
+static struct stats_cmd stats_cmd_table[256] = {
+/* letter handler oper admin */
+ ['a'] = HANDLER_NORM(stats_dns_servers, true, true),
+ ['A'] = HANDLER_NORM(stats_dns_servers, true, true),
+ ['b'] = HANDLER_NORM(stats_delay, true, true),
+ ['B'] = HANDLER_NORM(stats_hash, true, true),
+ ['c'] = HANDLER_NORM(stats_connect, false, false),
+ ['C'] = HANDLER_NORM(stats_capability, true, false),
+ ['d'] = HANDLER_NORM(stats_tdeny, true, false),
+ ['D'] = HANDLER_NORM(stats_deny, true, false),
+ ['e'] = HANDLER_NORM(stats_exempt, true, false),
+ ['E'] = HANDLER_NORM(stats_events, true, true),
+ ['f'] = HANDLER_NORM(stats_comm, true, true),
+ ['F'] = HANDLER_NORM(stats_comm, true, true),
+ ['g'] = HANDLER_NORM(stats_prop_klines, true, false),
+ ['h'] = HANDLER_NORM(stats_hubleaf, false, false),
+ ['H'] = HANDLER_NORM(stats_hubleaf, false, false),
+ ['i'] = HANDLER_NORM(stats_auth, false, false),
+ ['I'] = HANDLER_NORM(stats_auth, false, false),
+ ['k'] = HANDLER_NORM(stats_tklines, false, false),
+ ['K'] = HANDLER_NORM(stats_klines, false, false),
+ ['l'] = HANDLER_PARV(stats_ltrace, false, false),
+ ['L'] = HANDLER_PARV(stats_ltrace, false, false),
+ ['m'] = HANDLER_NORM(stats_messages, false, false),
+ ['M'] = HANDLER_NORM(stats_messages, false, false),
+ ['n'] = HANDLER_NORM(stats_dnsbl, false, false),
+ ['o'] = HANDLER_NORM(stats_oper, false, false),
+ ['O'] = HANDLER_NORM(stats_privset, true, false),
+ ['p'] = HANDLER_NORM(stats_operedup, false, false),
+ ['P'] = HANDLER_NORM(stats_ports, false, false),
+ ['q'] = HANDLER_NORM(stats_tresv, true, false),
+ ['Q'] = HANDLER_NORM(stats_resv, true, false),
+ ['r'] = HANDLER_NORM(stats_usage, true, false),
+ ['R'] = HANDLER_NORM(stats_usage, true, false),
+ ['s'] = HANDLER_NORM(stats_ssld, true, true),
+ ['S'] = HANDLER_NORM(stats_ssld, true, true),
+ ['t'] = HANDLER_NORM(stats_tstats, true, false),
+ ['T'] = HANDLER_NORM(stats_tstats, true, false),
+ ['u'] = HANDLER_NORM(stats_uptime, false, false),
+ ['U'] = HANDLER_NORM(stats_shared, true, false),
+ ['v'] = HANDLER_NORM(stats_servers, false, false),
+ ['V'] = HANDLER_NORM(stats_servers, false, false),
+ ['x'] = HANDLER_NORM(stats_tgecos, true, false),
+ ['X'] = HANDLER_NORM(stats_gecos, true, false),
+ ['y'] = HANDLER_NORM(stats_class, false, false),
+ ['Y'] = HANDLER_NORM(stats_class, false, false),
+ ['z'] = HANDLER_NORM(stats_memory, true, false),
+ ['Z'] = HANDLER_NORM(stats_ziplinks, true, false),
+ ['?'] = HANDLER_NORM(stats_servlinks, false, false),
};
/*
* This will search the tables for the appropriate stats letter,
* if found execute it.
*/
-static int
+static void
m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static time_t last_used = 0;
- int i;
struct stats_cmd *cmd;
- char statchar;
+ unsigned char statchar;
int did_stats = 0;
statchar = parv[1][0];
me.name, source_p->name, "STATS");
sendto_one_numeric(source_p, RPL_ENDOFSTATS,
form_str(RPL_ENDOFSTATS), statchar);
- return 0;
+ return;
}
else
last_used = rb_current_time();
}
if(hunt_server (client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
- return 0;
+ return;
- if((statchar != 'L') && (statchar != 'l'))
- {
+ if(tolower(statchar) != 'l')
+ /* FIXME */
did_stats = stats_spy(source_p, statchar, NULL);
- }
- else
- {
- /* Blah, stats L needs the parameters, none of the others do.. */
- stats_ltrace (source_p, parc, parv);
- goto stats_out;
- }
/* if did_stats is true, a module grabbed this STATS request */
if(did_stats)
goto stats_out;
}
- cmd->handler(source_p);
+ if(cmd->need_parv)
+ cmd->handler_parv(source_p, parc, parv);
+ else
+ cmd->handler(source_p);
}
stats_out:
/* Send the end of stats notice, and the stats_spy */
sendto_one_numeric(source_p, RPL_ENDOFSTATS,
form_str(RPL_ENDOFSTATS), statchar);
-
- return 0;
}
static void
stats_delay(struct Client *source_p)
{
struct nd_entry *nd;
- struct DictionaryIter iter;
+ rb_dictionary_iter iter;
- DICTIONARY_FOREACH(nd, &iter, nd_dict)
+ RB_DICTIONARY_FOREACH(nd, &iter, nd_dict)
{
sendto_one_notice(source_p, ":Delaying: %s for %ld",
nd->name, (long) nd->expire);
form_str(RPL_STATSCLINE),
"*@127.0.0.1",
buf, server_p->name,
- server_p->port, server_p->class_name);
+ server_p->port, server_p->class_name,
+ server_p->certfp ? server_p->certfp : "*");
}
}
aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
(struct sockaddr *)&source_p->localClient->ip,
CONF_CLIENT,
- source_p->localClient->ip.ss_family,
+ GET_SS_FAMILY(&source_p->localClient->ip),
source_p->username, NULL);
else
aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_CLIENT,
aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
(struct sockaddr *)&source_p->localClient->ip,
CONF_KILL,
- source_p->localClient->ip.ss_family,
+ GET_SS_FAMILY(&source_p->localClient->ip),
source_p->username, NULL);
else
aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL,
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
sendto_one_numeric(source_p, RPL_STATSKLINE,
- form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+ form_str(RPL_STATSKLINE), (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
host, user, pass, oper_reason ? "|" : "",
oper_reason ? oper_reason : "");
}
aconf = find_conf_by_address (source_p->host, source_p->sockhost, NULL,
(struct sockaddr *)&source_p->localClient->ip,
CONF_KILL,
- source_p->localClient->ip.ss_family,
+ GET_SS_FAMILY(&source_p->localClient->ip),
source_p->username, NULL);
else
aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL,
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
sendto_one_numeric(source_p, RPL_STATSKLINE, form_str(RPL_STATSKLINE),
- aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
+ (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
host, user, pass, oper_reason ? "|" : "",
oper_reason ? oper_reason : "");
}
static void
stats_messages(struct Client *source_p)
{
- struct DictionaryIter iter;
+ rb_dictionary_iter iter;
struct Message *msg;
- struct alias_entry *amsg;
- DICTIONARY_FOREACH(msg, &iter, cmd_dict)
+ RB_DICTIONARY_FOREACH(msg, &iter, cmd_dict)
{
s_assert(msg->cmd != NULL);
sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
msg->cmd, msg->count,
msg->bytes, msg->rcount);
}
-
- DICTIONARY_FOREACH(amsg, &iter, alias_dict)
- {
- s_assert(amsg->name != NULL);
- sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
- form_str(RPL_STATSCOMMANDS),
- amsg->name, amsg->hits, 0L, 0);
- }
}
static void
stats_dnsbl(struct Client *source_p)
{
- rb_dlink_node *ptr;
- struct Blacklist *blptr;
+ rb_dictionary_iter iter;
+ struct BlacklistStats *stats;
- RB_DLINK_FOREACH(ptr, blacklist_list.head)
- {
- blptr = ptr->data;
+ if(bl_stats == NULL)
+ return;
+ RB_DICTIONARY_FOREACH(stats, &iter, bl_stats)
+ {
/* use RPL_STATSDEBUG for now -- jilles */
- sendto_one_numeric(source_p, RPL_STATSDEBUG, "n :%d %s %s (%d)",
- blptr->hits,
- blptr->host,
- blptr->status & CONF_ILLEGAL ? "disabled" : "active",
- blptr->refcount);
+ sendto_one_numeric(source_p, RPL_STATSDEBUG, "n :%d %s",
+ stats->hits, (const char *)iter.cur->key);
}
}
stats_tresv(struct Client *source_p)
{
struct ConfItem *aconf;
- struct rb_radixtree_iteration_state state;
+ rb_radixtree_iteration_state state;
rb_dlink_node *ptr;
- int i;
RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{
stats_resv(struct Client *source_p)
{
struct ConfItem *aconf;
- struct rb_radixtree_iteration_state state;
+ rb_radixtree_iteration_state state;
rb_dlink_node *ptr;
- int i;
RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{
static void
stats_usage (struct Client *source_p)
{
+#ifndef _WIN32
struct rusage rus;
time_t secs;
time_t rup;
"R :Signals %d Context Vol. %d Invol %d",
(int) rus.ru_nsignals, (int) rus.ru_nvcsw,
(int) rus.ru_nivcsw);
+#endif
}
static void
sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server recv: %s", buf);
}
-static int
+static inline bool
stats_l_should_show_oper(struct Client *target_p)
{
- if (IsOperInvis(target_p))
- return 0;
-
- return 1;
+ return (!IsOperInvis(target_p));
}
static void
stats_ltrace(struct Client *source_p, int parc, const char *parv[])
{
- int doall = 0;
- int wilds = 0;
+ bool doall = false;
+ bool wilds = false;
const char *name;
char statchar = parv[1][0];
(!MyClient(source_p) && !irccmp(parv[2], me.id)))
{
name = me.name;
- doall = 1;
+ doall = true;
}
else
{
else
{
name = me.name;
- doall = 1;
+ doall = true;
}
stats_spy(source_p, statchar, name);
}
static void
-stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
- rb_dlink_list * list, char statchar, int (*check_fn)(struct Client *target_p))
+stats_l_list(struct Client *source_p, const char *name, bool doall, bool wilds,
+ rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *target_p))
{
rb_dlink_node *ptr;
struct Client *target_p;
* output - none
* side effects -
* This little helper function reports to opers if configured.
- * personally, I don't see why opers need to see stats requests
- * at all. They are just "noise" to an oper, and users can't do
- * any damage with stats requests now anyway. So, why show them?
- * -Dianora
*/
static int
stats_spy(struct Client *source_p, char statchar, const char *name)
projects / solanum.git / blobdiff