authd: It Works, Bitches™

[solanum.git] / modules / m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index b963d2ba44db6ce68a48c9c630ac4e0b0a696b44..afaea433d3f45da910ba8f1dbf9b74e9e2d168a1 100644 (file)
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -25,7 +25,6 @@
 #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 */
@@ -38,7 +37,6 @@
 #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"
@@ -142,51 +140,51 @@ static void stats_capability(struct Client *);
  */
 static struct stats_cmd stats_cmd_table[256] = {
 /*     letter  handler/handler_parv                    parv    oper    admin   */
-       ['a'] = { { stats_dns_servers },                        false,  true,   true,   },
-       ['A'] = { { stats_dns_servers },                        false,  true,   true,   },
-       ['b'] = { { stats_delay },                              false,  true,   true,   },
-       ['B'] = { { stats_hash },                               false,  true,   true,   },
+       ['a'] = { { stats_dns_servers },                false,  true,   true,   },
+       ['A'] = { { stats_dns_servers },                false,  true,   true,   },
+       ['b'] = { { stats_delay },                      false,  true,   true,   },
+       ['B'] = { { stats_hash },                       false,  true,   true,   },
        ['c'] = { { stats_connect },                    false,  false,  false,  },
        ['C'] = { { stats_capability },                 false,  true,   false,  },
-       ['d'] = { { stats_tdeny },                              false,  true,   false,  },
-       ['D'] = { { stats_deny },                               false,  true,   false,  },
-       ['e'] = { { stats_exempt },                             false,  true,   false,  },
-       ['E'] = { { stats_events },                             false,  true,   true,   },
-       ['f'] = { { stats_comm },                               false,  true,   true,   },
-       ['F'] = { { stats_comm },                               false,  true,   true,   },
-       ['g'] = { { stats_prop_klines },                        false,  true,   false,  },
+       ['d'] = { { stats_tdeny },                      false,  true,   false,  },
+       ['D'] = { { stats_deny },                       false,  true,   false,  },
+       ['e'] = { { stats_exempt },                     false,  true,   false,  },
+       ['E'] = { { stats_events },                     false,  true,   true,   },
+       ['f'] = { { stats_comm },                       false,  true,   true,   },
+       ['F'] = { { stats_comm },                       false,  true,   true,   },
+       ['g'] = { { stats_prop_klines },                false,  true,   false,  },
        ['h'] = { { stats_hubleaf },                    false,  false,  false,  },
        ['H'] = { { stats_hubleaf },                    false,  false,  false,  },
-       ['i'] = { { stats_auth },                               false,  false,  false,  },
-       ['I'] = { { stats_auth },                               false,  false,  false,  },
+       ['i'] = { { stats_auth },                       false,  false,  false,  },
+       ['I'] = { { stats_auth },                       false,  false,  false,  },
        ['k'] = { { stats_tklines },                    false,  false,  false,  },
-       ['K'] = { { stats_klines },                             false,  false,  false,  },
-       ['l'] = { { .handler_parv = stats_ltrace },             true,   false,  false,  },
-       ['L'] = { { .handler_parv = stats_ltrace },             true,   false,  false,  },
+       ['K'] = { { stats_klines },                     false,  false,  false,  },
+       ['l'] = { { .handler_parv = stats_ltrace },     true,   false,  false,  },
+       ['L'] = { { .handler_parv = stats_ltrace },     true,   false,  false,  },
        ['m'] = { { stats_messages },                   false,  false,  false,  },
        ['M'] = { { stats_messages },                   false,  false,  false,  },
-       ['n'] = { { stats_dnsbl },                              false,  false,  false,  },
-       ['o'] = { { stats_oper },                               false,  false,  false,  },
+       ['n'] = { { stats_dnsbl },                      false,  false,  false,  },
+       ['o'] = { { stats_oper },                       false,  false,  false,  },
        ['O'] = { { stats_privset },                    false,  true,   false,  },
        ['p'] = { { stats_operedup },                   false,  false,  false,  },
-       ['P'] = { { stats_ports },                              false,  false,  false,  },
-       ['q'] = { { stats_tresv },                              false,  true,   false,  },
-       ['Q'] = { { stats_resv },                               false,  true,   false,  },
-       ['r'] = { { stats_usage },                              false,  true,   false,  },
-       ['R'] = { { stats_usage },                              false,  true,   false,  },
-       ['s'] = { { stats_ssld },                               false,  true,   true,   },
-       ['S'] = { { stats_ssld },                               false,  true,   true,   },
-       ['t'] = { { stats_tstats },                             false,  true,   false,  },
-       ['T'] = { { stats_tstats },                             false,  true,   false,  },
-       ['u'] = { { stats_uptime },                             false,  false,  false,  },
-       ['U'] = { { stats_shared },                             false,  true,   false,  },
+       ['P'] = { { stats_ports },                      false,  false,  false,  },
+       ['q'] = { { stats_tresv },                      false,  true,   false,  },
+       ['Q'] = { { stats_resv },                       false,  true,   false,  },
+       ['r'] = { { stats_usage },                      false,  true,   false,  },
+       ['R'] = { { stats_usage },                      false,  true,   false,  },
+       ['s'] = { { stats_ssld },                       false,  true,   true,   },
+       ['S'] = { { stats_ssld },                       false,  true,   true,   },
+       ['t'] = { { stats_tstats },                     false,  true,   false,  },
+       ['T'] = { { stats_tstats },                     false,  true,   false,  },
+       ['u'] = { { stats_uptime },                     false,  false,  false,  },
+       ['U'] = { { stats_shared },                     false,  true,   false,  },
        ['v'] = { { stats_servers },                    false,  false,  false,  },
        ['V'] = { { stats_servers },                    false,  false,  false,  },
-       ['x'] = { { stats_tgecos },                             false,  true,   false,  },
-       ['X'] = { { stats_gecos },                              false,  true,   false,  },
-       ['y'] = { { stats_class },                              false,  false,  false,  },
-       ['Y'] = { { stats_class },                              false,  false,  false,  },
-       ['z'] = { { stats_memory },                             false,  true,   false,  },
+       ['x'] = { { stats_tgecos },                     false,  true,   false,  },
+       ['X'] = { { stats_gecos },                      false,  true,   false,  },
+       ['y'] = { { stats_class },                      false,  false,  false,  },
+       ['Y'] = { { stats_class },                      false,  false,  false,  },
+       ['z'] = { { stats_memory },                     false,  true,   false,  },
        ['Z'] = { { stats_ziplinks },                   false,  true,   false,  },
        ['?'] = { { stats_servlinks },                  false,  false,  false,  },
 };
@@ -285,9 +283,9 @@ 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);
@@ -734,11 +732,11 @@ stats_klines(struct Client *source_p)
 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,
@@ -747,7 +745,7 @@ stats_messages(struct Client *source_p)
                                   msg->bytes, msg->rcount);
        }
 
-       DICTIONARY_FOREACH(amsg, &iter, alias_dict)
+       RB_DICTIONARY_FOREACH(amsg, &iter, alias_dict)
        {
                s_assert(amsg->name != NULL);
                sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
@@ -759,19 +757,14 @@ stats_messages(struct Client *source_p)
 static void
 stats_dnsbl(struct Client *source_p)
 {
-       rb_dlink_node *ptr;
-       struct Blacklist *blptr;
+       rb_dictionary_iter iter;
+       struct blacklist_stats *stats;
 
-       RB_DLINK_FOREACH(ptr, blacklist_list.head)
+       RB_DICTIONARY_FOREACH(stats, &iter, bl_stats)
        {
-               blptr = ptr->data;
-
                /* 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);
        }
 }
 
@@ -870,7 +863,7 @@ static void
 stats_tresv(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       struct rb_radixtree_iteration_state state;
+       rb_radixtree_iteration_state state;
        rb_dlink_node *ptr;
 
        RB_DLINK_FOREACH(ptr, resv_conf_list.head)
@@ -896,7 +889,7 @@ static void
 stats_resv(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       struct rb_radixtree_iteration_state state;
+       rb_radixtree_iteration_state state;
        rb_dlink_node *ptr;
 
        RB_DLINK_FOREACH(ptr, resv_conf_list.head)