X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1e320728f3b0c49c6dfdd42ee6ae99d6478bdb77..3619e299876d4daa39ffa932a4114a60ec0203a8:/modules/m_stats.c?ds=sidebyside diff --git a/modules/m_stats.c b/modules/m_stats.c index c013c99..dd678a3 100644 --- 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, }, @@ -318,11 +319,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); } @@ -497,7 +494,7 @@ stats_auth (struct Client *source_p) else if((ConfigFileEntry.stats_i_oper_only == 1) && !IsOper (source_p)) { struct ConfItem *aconf; - char *name, *host, *pass, *user, *classname; + char *name, *host, *pass = "*", *user, *classname; int port; if(MyConnect (source_p)) @@ -505,18 +502,20 @@ stats_auth (struct Client *source_p) (struct sockaddr *)&source_p->localClient->ip, CONF_CLIENT, source_p->localClient->ip.ss_family, - source_p->username); + source_p->username, NULL); else aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_CLIENT, - 0, source_p->username); + 0, source_p->username, NULL); if(aconf == NULL) return; get_printable_conf (aconf, &name, &host, &pass, &user, &port, &classname); + if(!EmptyString(aconf->spasswd)) + pass = aconf->spasswd; sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE), - name, show_iline_prefix(source_p, aconf, user), + name, pass, show_iline_prefix(source_p, aconf, user), host, port, classname); } @@ -545,10 +544,10 @@ stats_tklines(struct Client *source_p) (struct sockaddr *)&source_p->localClient->ip, CONF_KILL, source_p->localClient->ip.ss_family, - source_p->username); + source_p->username, NULL); else aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL, - 0, source_p->username); + 0, source_p->username, NULL); if(aconf == NULL) return; @@ -611,10 +610,10 @@ stats_klines(struct Client *source_p) (struct sockaddr *)&source_p->localClient->ip, CONF_KILL, source_p->localClient->ip.ss_family, - source_p->username); + source_p->username, NULL); else aconf = find_conf_by_address (source_p->host, NULL, NULL, NULL, CONF_KILL, - 0, source_p->username); + 0, source_p->username, NULL); if(aconf == NULL) return; @@ -676,10 +675,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() * @@ -854,7 +858,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++; } @@ -864,7 +868,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++; } @@ -877,7 +881,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()); @@ -913,8 +919,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 @@ -951,9 +957,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'} }; @@ -963,7 +969,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; @@ -1394,7 +1400,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, @@ -1548,7 +1554,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,