X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/b3ebc7ab9e187cbbe55b0085930d41bf4fe740c0..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_stats.c diff --git a/modules/m_stats.c b/modules/m_stats.c index 92fc3f24..667b8fbc 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -70,7 +70,8 @@ DECLARE_MODULE_AV1(stats, NULL, NULL, stats_clist, stats_hlist, NULL, "$Revision 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); +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_client(struct Client *source_p, struct Client *target_p, char statchar); @@ -94,6 +95,7 @@ static void stats_tdeny(struct Client *); static void stats_deny(struct Client *); static void stats_exempt(struct Client *); static void stats_events(struct Client *); +static void stats_prop_klines(struct Client *); static void stats_hubleaf(struct Client *); static void stats_auth(struct Client *); static void stats_tklines(struct Client *); @@ -101,6 +103,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 *); @@ -118,6 +121,8 @@ static void stats_servlinks(struct Client *); static void stats_ltrace(struct Client *, int, const char **); static void stats_ziplinks(struct Client *); static void stats_comm(struct Client *); +static void stats_capability(struct Client *); + /* This table contains the possible stats items, in order: * stats letter, function to call, operonly? adminonly? * case only matters in the stats letter column.. -- fl_ @@ -129,13 +134,14 @@ static struct StatsStruct stats_cmd_table[] = { {'b', stats_delay, 1, 1, }, {'B', stats_hash, 1, 1, }, {'c', stats_connect, 0, 0, }, - {'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, }, @@ -148,7 +154,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 +179,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 * @@ -450,6 +455,32 @@ stats_events (struct Client *source_p) rb_dump_events(stats_events_cb, source_p); } +static void +stats_prop_klines(struct Client *source_p) +{ + struct ConfItem *aconf; + rb_dlink_node *ptr; + char *user, *host, *pass, *oper_reason; + + RB_DLINK_FOREACH(ptr, prop_bans.head) + { + aconf = ptr->data; + + /* Skip non-klines and deactivated klines. */ + if(aconf->status != CONF_KILL) + continue; + + get_printable_kline(source_p, aconf, &host, &pass, + &user, &oper_reason); + + sendto_one_numeric(source_p, RPL_STATSKLINE, + form_str(RPL_STATSKLINE), + 'g', host, user, pass, + oper_reason ? "|" : "", + oper_reason ? oper_reason : ""); + } +} + static void stats_hubleaf(struct Client *source_p) { @@ -674,10 +705,29 @@ 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_capability_walk(const char *line, void *data) +{ + struct Client *client_p = data; + + sendto_one_numeric(client_p, RPL_STATSDEBUG, "C :%s", line); +} + +static void +stats_capability(struct Client *client_p) +{ + capability_index_stats(stats_capability_walk, client_p); +} + +static void +stats_privset(struct Client *source_p) +{ + privilegeset_report(source_p); +} /* stats_operedup() * @@ -739,7 +789,7 @@ stats_tresv(struct Client *source_p) if(aconf->hold) sendto_one_numeric(source_p, RPL_STATSQLINE, form_str(RPL_STATSQLINE), - 'q', aconf->port, aconf->name, aconf->passwd); + 'q', aconf->port, aconf->host, aconf->passwd); } HASH_WALK(i, R_MAX, ptr, resvTable) @@ -748,7 +798,7 @@ stats_tresv(struct Client *source_p) if(aconf->hold) sendto_one_numeric(source_p, RPL_STATSQLINE, form_str(RPL_STATSQLINE), - 'q', aconf->port, aconf->name, aconf->passwd); + 'q', aconf->port, aconf->host, aconf->passwd); } HASH_WALK_END } @@ -767,7 +817,7 @@ stats_resv(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, RPL_STATSQLINE, form_str(RPL_STATSQLINE), - 'Q', aconf->port, aconf->name, aconf->passwd); + 'Q', aconf->port, aconf->host, aconf->passwd); } HASH_WALK(i, R_MAX, ptr, resvTable) @@ -776,7 +826,7 @@ stats_resv(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, RPL_STATSQLINE, form_str(RPL_STATSQLINE), - 'Q', aconf->port, aconf->name, aconf->passwd); + 'Q', aconf->port, aconf->host, aconf->passwd); } HASH_WALK_END } @@ -812,7 +862,7 @@ stats_usage (struct Client *source_p) rup = 1; sendto_one_numeric(source_p, RPL_STATSDEBUG, - "R :CPU Secs %d:%d User %d:%d System %d:%d", + "R :CPU Secs %d:%02d User %d:%02d System %d:%02d", (int) (secs / 60), (int) (secs % 60), (int) (rus.ru_utime.tv_sec / 60), (int) (rus.ru_utime.tv_sec % 60), @@ -852,7 +902,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++; } @@ -862,7 +912,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++; } @@ -875,7 +925,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()); @@ -893,6 +945,8 @@ stats_tstats (struct Client *source_p) sendto_one_numeric(source_p, RPL_STATSDEBUG, "T :tgchange blocked msgs %u restricted addrs %lu", sp.is_tgch, rb_dlink_list_length(&tgchange_list)); + sendto_one_numeric(source_p, RPL_STATSDEBUG, + "T :ratelimit blocked commands %u", sp.is_rl); sendto_one_numeric(source_p, RPL_STATSDEBUG, "T :auth successes %u fails %u", sp.is_asuc, sp.is_abad); @@ -911,8 +965,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 @@ -949,9 +1003,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'} }; @@ -961,7 +1015,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; @@ -1074,7 +1128,7 @@ stats_tgecos(struct Client *source_p) if(aconf->hold) sendto_one_numeric(source_p, RPL_STATSXLINE, form_str(RPL_STATSXLINE), - 'x', aconf->port, aconf->name, + 'x', aconf->port, aconf->host, aconf->passwd); } } @@ -1092,7 +1146,7 @@ stats_gecos(struct Client *source_p) if(!aconf->hold) sendto_one_numeric(source_p, RPL_STATSXLINE, form_str(RPL_STATSXLINE), - 'X', aconf->port, aconf->name, + 'X', aconf->port, aconf->host, aconf->passwd); } } @@ -1112,7 +1166,6 @@ stats_memory (struct Client *source_p) { struct Client *target_p; struct Channel *chptr; - struct Ban *actualBan; rb_dlink_node *rb_dlink; rb_dlink_node *ptr; int channel_count = 0; @@ -1194,7 +1247,6 @@ stats_memory (struct Client *source_p) RB_DLINK_FOREACH(rb_dlink, chptr->banlist.head) { - actualBan = rb_dlink->data; channel_bans++; channel_ban_memory += sizeof(rb_dlink_node) + sizeof(struct Ban); @@ -1202,7 +1254,6 @@ stats_memory (struct Client *source_p) RB_DLINK_FOREACH(rb_dlink, chptr->exceptlist.head) { - actualBan = rb_dlink->data; channel_except++; channel_except_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban)); @@ -1210,7 +1261,6 @@ stats_memory (struct Client *source_p) RB_DLINK_FOREACH(rb_dlink, chptr->invexlist.head) { - actualBan = rb_dlink->data; channel_invex++; channel_invex_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban)); @@ -1218,7 +1268,6 @@ stats_memory (struct Client *source_p) RB_DLINK_FOREACH(rb_dlink, chptr->quietlist.head) { - actualBan = rb_dlink->data; channel_quiets++; channel_quiet_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban)); @@ -1429,6 +1478,15 @@ stats_servlinks (struct Client *source_p) sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server recv: %s", buf); } +static int +stats_l_should_show_oper(struct Client *target_p) +{ + if (IsOperInvis(target_p)) + return 0; + + return 1; +} + static void stats_ltrace(struct Client *source_p, int parc, const char *parv[]) { @@ -1489,8 +1547,8 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[]) /* local opers get everyone */ if(MyOper(source_p)) { - stats_l_list(source_p, name, doall, wilds, &unknown_list, statchar); - stats_l_list(source_p, name, doall, wilds, &lclient_list, statchar); + stats_l_list(source_p, name, doall, wilds, &unknown_list, statchar, NULL); + stats_l_list(source_p, name, doall, wilds, &lclient_list, statchar, NULL); } else { @@ -1498,12 +1556,12 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[]) if(MyClient(source_p)) stats_l_client(source_p, source_p, statchar); - stats_l_list(source_p, name, doall, wilds, &local_oper_list, statchar); + stats_l_list(source_p, name, doall, wilds, &local_oper_list, statchar, stats_l_should_show_oper); } if (!ConfigServerHide.flatten_links || IsOper(source_p) || IsExemptShide(source_p)) - stats_l_list(source_p, name, doall, wilds, &serv_list, statchar); + stats_l_list(source_p, name, doall, wilds, &serv_list, statchar, NULL); return; } @@ -1511,15 +1569,14 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[]) /* ok, at this point theyre looking for a specific client whos on * our server.. but it contains a wildcard. --fl */ - stats_l_list(source_p, name, doall, wilds, &lclient_list, statchar); + stats_l_list(source_p, name, doall, wilds, &lclient_list, statchar, NULL); return; } - static void stats_l_list(struct Client *source_p, const char *name, int doall, int wilds, - rb_dlink_list * list, char statchar) + rb_dlink_list * list, char statchar, int (*check_fn)(struct Client *target_p)) { rb_dlink_node *ptr; struct Client *target_p; @@ -1535,7 +1592,8 @@ stats_l_list(struct Client *source_p, const char *name, int doall, int wilds, if(!doall && wilds && !match(name, target_p->name)) continue; - stats_l_client(source_p, target_p, statchar); + if (check_fn == NULL || check_fn(target_p)) + stats_l_client(source_p, target_p, statchar); } }