ENCAPs cannot come from local clients, no need to check.

[irc/rqf/shadowircd.git] / modules / m_stats.c

diff --git a/modules/m_stats.c b/modules/m_stats.c
index e63c0de668b03165bd49479fcddd9f56a19b6b82..12adc9c3ff7ae2652596f94563f942e87bd1b7b3 100644 (file)
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -101,6 +101,7 @@ static void stats_klines(struct Client *);
 static void stats_messages(struct Client *);
 static void stats_dnsbl(struct Client *);
 static void stats_oper(struct Client *);
+static void stats_privset(struct Client *);
 static void stats_operedup(struct Client *);
 static void stats_ports(struct Client *);
 static void stats_tresv(struct Client *);
@@ -148,7 +149,7 @@ static struct StatsStruct stats_cmd_table[] = {
        {'M', stats_messages,           0, 0, },
        {'n', stats_dnsbl,              0, 0, },
        {'o', stats_oper,               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, },
@@ -173,7 +174,6 @@ static struct StatsStruct stats_cmd_table[] = {
 
 /*
  * m_stats by fl_
- *      parv[0] = sender prefix
  *      parv[1] = stat letter/command
  *      parv[2] = (if present) server/mask in stats L, or target
  *
@@ -318,11 +318,7 @@ stats_connect(struct Client *source_p)
 
                sendto_one_numeric(source_p, RPL_STATSCLINE, 
                                form_str(RPL_STATSCLINE),
-#ifndef HIDE_SERVERS_IPS
-                               server_p->host,
-#else
                                "*@127.0.0.1", 
-#endif
                                buf, server_p->name,
                                server_p->port, server_p->class_name);
        }
@@ -678,10 +674,15 @@ stats_oper(struct Client *source_p)
                sendto_one_numeric(source_p, RPL_STATSOLINE, 
                                form_str(RPL_STATSOLINE),
                                oper_p->username, oper_p->host, oper_p->name,
-                               IsOper(source_p) ? get_oper_privs(oper_p->flags) : "0", "-1");
+                               IsOper(source_p) ? oper_p->privset->name : "0", "-1");
        }
 }
 
+static void
+stats_privset(struct Client *source_p)
+{
+       privilegeset_report(source_p);
+}
 
 /* stats_operedup()
  *
@@ -703,7 +704,7 @@ stats_operedup (struct Client *source_p)
                if(IsOperInvis(target_p) && !IsOper(source_p))
                        continue;
 
-               if(target_p->user->away)
+               if(get_metadata(target_p, "away"))
                        continue;
 
                count++;
@@ -856,7 +857,7 @@ stats_tstats (struct Client *source_p)
 
                sp.is_sbs += target_p->localClient->sendB;
                sp.is_sbr += target_p->localClient->receiveB;
-               sp.is_sti += rb_current_time() - target_p->localClient->firsttime;
+               sp.is_sti += (unsigned long long)(rb_current_time() - target_p->localClient->firsttime);
                sp.is_sv++;
        }
 
@@ -866,7 +867,7 @@ stats_tstats (struct Client *source_p)
 
                sp.is_cbs += target_p->localClient->sendB;
                sp.is_cbr += target_p->localClient->receiveB;
-               sp.is_cti += rb_current_time() - target_p->localClient->firsttime;
+               sp.is_cti += (unsigned long long)(rb_current_time() - target_p->localClient->firsttime);
                sp.is_cl++;
        }
 
@@ -879,7 +880,9 @@ stats_tstats (struct Client *source_p)
                           "T :accepts %u refused %u", sp.is_ac, sp.is_ref);
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
                        "T :rejected %u delaying %lu", 
-                       sp.is_rej, rb_dlink_list_length(&delay_exit));
+                       sp.is_rej, delay_exit_length());
+       sendto_one_numeric(source_p, RPL_STATSDEBUG,
+                          "T :throttled refused %u throttle list size %lu", sp.is_thr, throttle_size());
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
                        "T :nicks being delayed %lu",
                        get_nd_count());
@@ -915,8 +918,8 @@ stats_tstats (struct Client *source_p)
                                sp.is_cbr / 1024, 
                                sp.is_sbr / 1024);
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
-                               "T :time connected %lu %lu",
-                               (long int)sp.is_cti, (long int)sp.is_sti);
+                               "T :time connected %llu %llu",
+                               sp.is_cti, sp.is_sti);
 }
 
 static void
@@ -953,9 +956,9 @@ static struct shared_flags shared_flagtable[] =
        { SHARED_UNRESV,        'R' },
        { SHARED_LOCOPS,        'L' },
        { SHARED_REHASH,        'H' },
-       { SHARED_TDLINE,    'd' },
-       { SHARED_PDLINE,    'D' },
-       { SHARED_UNDLINE,   'E' },
+       { SHARED_TDLINE,        'd' },
+       { SHARED_PDLINE,        'D' },
+       { SHARED_UNDLINE,       'E' },
        { 0,                    '\0'}
 };
 
@@ -965,7 +968,7 @@ stats_shared (struct Client *source_p)
 {
        struct remote_conf *shared_p;
        rb_dlink_node *ptr;
-       char buf[15];
+       char buf[sizeof(shared_flagtable)/sizeof(shared_flagtable[0])];
        char *p;
        int i;
 
@@ -1134,7 +1137,6 @@ stats_memory (struct Client *source_p)
        int conf_count = 0;     /* conf lines */
        int users_invited_count = 0;    /* users invited */
        int user_channels = 0;  /* users in channels */
-       int aways_counted = 0;
        size_t number_servers_cached;   /* number of servers cached by scache */
 
        size_t channel_memory = 0;
@@ -1143,7 +1145,6 @@ stats_memory (struct Client *source_p)
        size_t channel_invex_memory = 0;
        size_t channel_quiet_memory = 0;
 
-       size_t away_memory = 0; /* memory used by aways */
        size_t ww = 0;          /* whowas array count */
        size_t wwm = 0;         /* whowas array memory used */
        size_t conf_memory = 0; /* memory used by conf lines */
@@ -1178,11 +1179,6 @@ stats_memory (struct Client *source_p)
                        users_counted++;
                        users_invited_count += rb_dlink_list_length(&target_p->user->invited);
                        user_channels += rb_dlink_list_length(&target_p->user->channel);
-                       if(target_p->user->away)
-                       {
-                               aways_counted++;
-                               away_memory += (strlen(target_p->user->away) + 1);
-                       }
                }
        }
 
@@ -1243,10 +1239,9 @@ stats_memory (struct Client *source_p)
                           (unsigned long) users_invited_count * sizeof(rb_dlink_node));
 
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
-                          "z :User channels %u(%lu) Aways %u(%d)",
+                          "z :User channels %u(%lu)",
                           user_channels,
-                          (unsigned long) user_channels * sizeof(rb_dlink_node),
-                          aways_counted, (int) away_memory);
+                          (unsigned long) user_channels * sizeof(rb_dlink_node));
 
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
                           "z :Attached confs %u(%lu)",
@@ -1396,7 +1391,7 @@ stats_servlinks (struct Client *source_p)
 
                sendto_one(source_p, Sformat,
                        get_id(&me, source_p), RPL_STATSLINKINFO, get_id(source_p, source_p),
-                       get_server_name(target_p, SHOW_IP),
+                       target_p->name,
                        (int) rb_linebuf_len (&target_p->localClient->buf_sendq),
                        (int) target_p->localClient->sendM,
                        (int) target_p->localClient->sendK,
@@ -1550,7 +1545,7 @@ stats_l_client(struct Client *source_p, struct Client *target_p,
        if(IsAnyServer(target_p))
        {
                sendto_one_numeric(source_p, RPL_STATSLINKINFO, Lformat,
-                               get_server_name(target_p, SHOW_IP),
+                               target_p->name,
                                (int) rb_linebuf_len(&target_p->localClient->buf_sendq),
                                (int) target_p->localClient->sendM,
                                (int) target_p->localClient->sendK,