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);
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 *);
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_
{'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, },
* parv[2] = (if present) server/mask in stats L, or target
*
* This will search the tables for the appropriate stats letter,
- * if found execute it.
+ * if found execute it.
*/
static int
m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
/* safe enough to give this on a local connect only */
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "STATS");
- sendto_one_numeric(source_p, RPL_ENDOFSTATS,
+ sendto_one_numeric(source_p, RPL_ENDOFSTATS,
form_str(RPL_ENDOFSTATS), statchar);
return 0;
}
}
/* Send the end of stats notice, and the stats_spy */
- sendto_one_numeric(source_p, RPL_ENDOFSTATS,
+ sendto_one_numeric(source_p, RPL_ENDOFSTATS,
form_str(RPL_ENDOFSTATS), statchar);
return 0;
char *s;
rb_dlink_node *ptr;
- if((ConfigFileEntry.stats_c_oper_only ||
+ if((ConfigFileEntry.stats_c_oper_only ||
(ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
!IsOper(source_p))
{
if(ServerConfIllegal(server_p))
continue;
- buf[0] = '\0';
s = buf;
if(IsOper(source_p))
*s++ = 'Z';
}
- if(!buf[0])
+ if(s == buf)
*s++ = '*';
*s = '\0';
- sendto_one_numeric(source_p, RPL_STATSCLINE,
+ sendto_one_numeric(source_p, RPL_STATSCLINE,
form_str(RPL_STATSCLINE),
- "*@127.0.0.1",
+ "*@127.0.0.1",
buf, server_p->name,
server_p->port, server_p->class_name);
}
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
- sendto_one_numeric(source_p, RPL_STATSDLINE,
+ sendto_one_numeric(source_p, RPL_STATSDLINE,
form_str (RPL_STATSDLINE),
'd', host, pass,
oper_reason ? "|" : "",
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
- sendto_one_numeric(source_p, RPL_STATSDLINE,
+ sendto_one_numeric(source_p, RPL_STATSDLINE,
form_str (RPL_STATSDLINE),
'D', host, pass,
oper_reason ? "|" : "",
static void
stats_exempt(struct Client *source_p)
{
- char *name, *host, *pass, *user, *classname;
+ char *name, *host, *user, *classname;
+ const char *pass;
struct AddressRec *arec;
struct ConfItem *aconf;
int i, port;
get_printable_conf (aconf, &name, &host, &pass,
&user, &port, &classname);
- sendto_one_numeric(source_p, RPL_STATSDLINE,
+ sendto_one_numeric(source_p, RPL_STATSDLINE,
form_str(RPL_STATSDLINE),
'e', host, pass, "", "");
}
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)
{
struct remote_conf *hub_p;
rb_dlink_node *ptr;
- if((ConfigFileEntry.stats_h_oper_only ||
+ if((ConfigFileEntry.stats_h_oper_only ||
(ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
!IsOper(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, *user, *classname;
+ const char *pass = "*";
int port;
if(MyConnect (source_p))
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
- sendto_one_numeric(source_p, RPL_STATSKLINE,
+ sendto_one_numeric(source_p, RPL_STATSKLINE,
form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
host, user, pass, oper_reason ? "|" : "",
oper_reason ? oper_reason : "");
{
aconf = ptr->data;
- get_printable_kline(source_p, aconf, &host, &pass,
+ get_printable_kline(source_p, aconf, &host, &pass,
&user, &oper_reason);
sendto_one_numeric(source_p, RPL_STATSKLINE,
RB_DLINK_FOREACH(ptr, oper_conf_list.head)
{
oper_p = ptr->data;
-
- sendto_one_numeric(source_p, RPL_STATSOLINE,
+
+ sendto_one_numeric(source_p, RPL_STATSOLINE,
form_str(RPL_STATSOLINE),
oper_p->username, oper_p->host, oper_p->name,
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)
{
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"p :%s (%s@%s)",
- target_p->name, target_p->username,
+ target_p->name, target_p->username,
target_p->host);
}
{
aconf = ptr->data;
if(aconf->hold)
- sendto_one_numeric(source_p, RPL_STATSQLINE,
+ 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)
{
aconf = ptr->data;
if(aconf->hold)
- sendto_one_numeric(source_p, RPL_STATSQLINE,
+ 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
}
{
aconf = ptr->data;
if(!aconf->hold)
- sendto_one_numeric(source_p, RPL_STATSQLINE,
+ sendto_one_numeric(source_p, RPL_STATSQLINE,
form_str(RPL_STATSQLINE),
'Q', aconf->port, aconf->host, aconf->passwd);
}
{
aconf = ptr->data;
if(!aconf->hold)
- sendto_one_numeric(source_p, RPL_STATSQLINE,
+ sendto_one_numeric(source_p, RPL_STATSQLINE,
form_str(RPL_STATSQLINE),
'Q', aconf->port, aconf->host, aconf->passwd);
}
rup = (rb_current_time() - startup_time) * hzz;
if(0 == rup)
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),
- (int) (rus.ru_stime.tv_sec / 60),
+ (int) (rus.ru_stime.tv_sec / 60),
(int) (rus.ru_stime.tv_sec % 60));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :RSS %ld ShMem %ld Data %ld Stack %ld",
- rus.ru_maxrss, (rus.ru_ixrss / rup),
+ rus.ru_maxrss, (rus.ru_ixrss / rup),
(rus.ru_idrss / rup), (rus.ru_isrss / rup));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :Swaps %d Reclaims %d Faults %d",
(int) rus.ru_msgrcv, (int) rus.ru_msgsnd);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :Signals %d Context Vol. %d Invol %d",
- (int) rus.ru_nsignals, (int) rus.ru_nvcsw,
+ (int) rus.ru_nsignals, (int) rus.ru_nvcsw,
(int) rus.ru_nivcsw);
}
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :accepts %u refused %u", sp.is_ac, sp.is_ref);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "T :rejected %u delaying %lu",
+ "T :rejected %u delaying %lu",
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());
"T :nick collisions %u saves %u unknown closes %u",
sp.is_kill, sp.is_save, sp.is_ni);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "T :wrong direction %u empty %u",
+ "T :wrong direction %u empty %u",
sp.is_wrdi, sp.is_empt);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :numerics seen %u", sp.is_num);
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);
"T :connected %u %u", sp.is_cl, sp.is_sv);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :bytes sent %lluK %lluK",
- sp.is_cbs / 1024,
+ sp.is_cbs / 1024,
sp.is_sbs / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :bytes recv %lluK %lluK",
- sp.is_cbr / 1024,
+ sp.is_cbr / 1024,
sp.is_sbr / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :time connected %llu %llu",
time_t now;
now = rb_current_time() - startup_time;
- sendto_one_numeric(source_p, RPL_STATSUPTIME,
+ sendto_one_numeric(source_p, RPL_STATSUPTIME,
form_str (RPL_STATSUPTIME),
- now / 86400, (now / 3600) % 24,
- (now / 60) % 60, now % 60);
+ (int)(now / 86400), (int)((now / 3600) % 24),
+ (int)((now / 60) % 60), (int)(now % 60));
sendto_one_numeric(source_p, RPL_STATSCONN,
form_str (RPL_STATSCONN),
- MaxConnectionCount, MaxClientCount,
+ MaxConnectionCount, MaxClientCount,
Count.totalrestartcount);
}
*p = '\0';
- sendto_one_numeric(source_p, RPL_STATSULINE,
+ sendto_one_numeric(source_p, RPL_STATSULINE,
form_str(RPL_STATSULINE),
shared_p->server, shared_p->username,
shared_p->host, buf);
*p = '\0';
- sendto_one_numeric(source_p, RPL_STATSULINE,
+ sendto_one_numeric(source_p, RPL_STATSULINE,
form_str(RPL_STATSULINE),
shared_p->server, "*", "*", buf);
}
(target_p->serv->by[0] ? target_p->serv->by : "Remote."),
(int) (rb_current_time() - target_p->localClient->lasttime),
(int) rb_linebuf_len (&target_p->localClient->buf_sendq),
- days, (days == 1) ? "" : "s", hours, minutes,
+ days, (days == 1) ? "" : "s", hours, minutes,
(int) seconds);
}
if(!aconf->hold)
sendto_one_numeric(source_p, RPL_STATSXLINE,
form_str(RPL_STATSXLINE),
- 'X', aconf->port, aconf->host,
+ 'X', aconf->port, aconf->host,
aconf->passwd);
}
}
{
struct Client *target_p;
struct Channel *chptr;
- struct Ban *actualBan;
rb_dlink_node *rb_dlink;
rb_dlink_node *ptr;
int channel_count = 0;
RB_DLINK_FOREACH(rb_dlink, chptr->banlist.head)
{
- actualBan = rb_dlink->data;
channel_bans++;
channel_ban_memory += sizeof(rb_dlink_node) + sizeof(struct Ban);
RB_DLINK_FOREACH(rb_dlink, chptr->exceptlist.head)
{
- actualBan = rb_dlink->data;
channel_except++;
channel_except_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
RB_DLINK_FOREACH(rb_dlink, chptr->invexlist.head)
{
- actualBan = rb_dlink->data;
channel_invex++;
channel_invex_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
RB_DLINK_FOREACH(rb_dlink, chptr->quietlist.head)
{
- actualBan = rb_dlink->data;
channel_quiets++;
channel_quiet_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
"z :Users %u(%lu) Invites %u(%lu)",
users_counted,
(unsigned long) users_counted * sizeof(struct User),
- users_invited_count,
+ users_invited_count,
(unsigned long) users_invited_count * sizeof(rb_dlink_node));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"z :Classes %u(%lu)",
- class_count,
+ class_count,
(unsigned long) class_count * sizeof(struct Class));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"z :Channel members %u(%lu) invite %u(%lu)",
channel_users,
(unsigned long) channel_users * sizeof(rb_dlink_node),
- channel_invites,
+ channel_invites,
(unsigned long) channel_invites * sizeof(rb_dlink_node));
total_channel_memory = channel_memory +
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"z :Hash: client %u(%ld) chan %u(%ld)",
- U_MAX, (long)(U_MAX * sizeof(rb_dlink_list)),
+ U_MAX, (long)(U_MAX * sizeof(rb_dlink_list)),
CH_MAX, (long)(CH_MAX * sizeof(rb_dlink_list)));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
total_memory += mem_servers_cached;
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "z :Total: whowas %d channel %d conf %d",
- (int) totww, (int) total_channel_memory,
+ "z :Total: whowas %d channel %d conf %d",
+ (int) totww, (int) total_channel_memory,
(int) conf_memory);
count_local_client_memory(&local_client_count, &local_client_memory_used);
target_p = ptr->data;
if(IsCapable (target_p, CAP_ZIP))
{
- zipstats = target_p->localClient->zipstats;
+ zipstats = target_p->localClient->zipstats;
sprintf(buf, "%.2f%%", zipstats->out_ratio);
sprintf(buf1, "%.2f%%", zipstats->in_ratio);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"(%llu kB data/%llu kB wire)] recv[%s compression "
"(%llu kB data/%llu kB wire)]",
target_p->name,
- buf, zipstats->out >> 10,
- zipstats->out_wire >> 10, buf1,
+ buf, zipstats->out >> 10,
+ zipstats->out_wire >> 10, buf1,
zipstats->in >> 10, zipstats->in_wire >> 10);
sent_data++;
}
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
- (rb_current_time() > target_p->localClient->lasttime) ?
+ (rb_current_time() > target_p->localClient->lasttime) ?
(rb_current_time() - target_p->localClient->lasttime) : 0,
IsOper (source_p) ? show_capabilities (target_p) : "TS");
}
uptime = (rb_current_time() - startup_time);
snprintf(buf, sizeof buf, "%7.2f %s (%4.1f K/s)",
- _GMKv (me.localClient->sendK),
+ _GMKv (me.localClient->sendK),
_GMKs (me.localClient->sendK),
(float) ((float) me.localClient->sendK / (float) uptime));
sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server send: %s", buf);
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[])
{
/* 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
{
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;
}
/* 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;
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);
}
}
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
- (rb_current_time() > target_p->localClient->lasttime) ?
+ (rb_current_time() > target_p->localClient->lasttime) ?
(rb_current_time() - target_p->localClient->lasttime) : 0,
IsOper(source_p) ? show_capabilities(target_p) : "-");
}
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
- (rb_current_time() > target_p->localClient->lasttime) ?
+ (rb_current_time() > target_p->localClient->lasttime) ?
(rb_current_time() - target_p->localClient->lasttime) : 0,
"-");
}