-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_deny(struct Client *);
static void stats_exempt(struct Client *);
static void stats_events(struct Client *);
static void stats_deny(struct Client *);
static void stats_exempt(struct Client *);
static void stats_events(struct Client *);
static void stats_hubleaf(struct Client *);
static void stats_auth(struct Client *);
static void stats_tklines(struct Client *);
static void stats_hubleaf(struct Client *);
static void stats_auth(struct Client *);
static void stats_tklines(struct Client *);
static void stats_messages(struct Client *);
static void stats_dnsbl(struct Client *);
static void stats_oper(struct Client *);
static void stats_messages(struct Client *);
static void stats_dnsbl(struct Client *);
static void stats_oper(struct Client *);
static void stats_operedup(struct Client *);
static void stats_ports(struct Client *);
static void stats_tresv(struct Client *);
static void stats_operedup(struct Client *);
static void stats_ports(struct Client *);
static void stats_tresv(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_ltrace(struct Client *, int, const char **);
static void stats_ziplinks(struct Client *);
static void stats_comm(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_
/* 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, },
{'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, },
{'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, },
{'h', stats_hubleaf, 0, 0, },
{'H', stats_hubleaf, 0, 0, },
{'i', stats_auth, 0, 0, },
{'h', stats_hubleaf, 0, 0, },
{'H', stats_hubleaf, 0, 0, },
{'i', stats_auth, 0, 0, },
{'M', stats_messages, 0, 0, },
{'n', stats_dnsbl, 0, 0, },
{'o', stats_oper, 0, 0, },
{'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, },
{'p', stats_operedup, 0, 0, },
{'P', stats_ports, 0, 0, },
{'q', stats_tresv, 1, 0, },
* parv[1] = stat letter/command
* parv[2] = (if present) server/mask in stats L, or target
*
* This will search the tables for the appropriate stats letter,
* parv[1] = stat letter/command
* parv[2] = (if present) server/mask in stats L, or target
*
* This will search the tables for the appropriate stats letter,
*/
static int
m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
*/
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");
/* safe enough to give this on a local connect only */
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "STATS");
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
get_printable_conf (aconf, &name, &host, &pass,
&user, &port, &classname);
get_printable_conf (aconf, &name, &host, &pass,
&user, &port, &classname);
form_str(RPL_STATSDLINE),
'e', host, pass, "", "");
}
form_str(RPL_STATSDLINE),
'e', host, pass, "", "");
}
+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 : "");
+ }
+}
+
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
get_printable_kline(source_p, aconf, &host, &pass, &user, &oper_reason);
form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
host, user, pass, oper_reason ? "|" : "",
oper_reason ? oper_reason : "");
form_str(RPL_STATSKLINE), aconf->flags & CONF_FLAGS_TEMPORARY ? 'k' : 'K',
host, user, pass, oper_reason ? "|" : "",
oper_reason ? oper_reason : "");
- get_printable_kline(source_p, aconf, &host, &pass,
+ get_printable_kline(source_p, aconf, &host, &pass,
form_str(RPL_STATSOLINE),
oper_p->username, oper_p->host, oper_p->name,
IsOper(source_p) ? oper_p->privset->name : "0", "-1");
}
}
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)
+{
+ privilegeset_report(source_p);
+}
- '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)
}
HASH_WALK(i, R_MAX, ptr, resvTable)
{
aconf = ptr->data;
if(aconf->hold)
- 'q', aconf->port, aconf->name, aconf->passwd);
+ 'q', aconf->port, aconf->host, aconf->passwd);
- '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)
}
HASH_WALK(i, R_MAX, ptr, resvTable)
{
aconf = ptr->data;
if(!aconf->hold)
- 'Q', aconf->port, aconf->name, aconf->passwd);
+ 'Q', aconf->port, aconf->host, aconf->passwd);
(int) (secs / 60), (int) (secs % 60),
(int) (rus.ru_utime.tv_sec / 60),
(int) (rus.ru_utime.tv_sec % 60),
(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));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :RSS %ld ShMem %ld Data %ld Stack %ld",
(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_idrss / rup), (rus.ru_isrss / rup));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :Swaps %d Reclaims %d Faults %d",
(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_msgrcv, (int) rus.ru_msgsnd);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"R :Signals %d Context Vol. %d Invol %d",
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,
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,
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :nicks being delayed %lu",
get_nd_count());
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :nicks being delayed %lu",
get_nd_count());
"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 :nick collisions %u saves %u unknown closes %u",
sp.is_kill, sp.is_save, sp.is_ni);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
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));
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 :auth successes %u fails %u",
sp.is_asuc, sp.is_abad);
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",
"T :connected %u %u", sp.is_cl, sp.is_sv);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :bytes sent %lluK %lluK",
sp.is_sbs / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :bytes recv %lluK %lluK",
sp.is_sbs / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :bytes recv %lluK %lluK",
sp.is_sbr / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :time connected %llu %llu",
sp.is_sbr / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :time connected %llu %llu",
- 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),
sendto_one_numeric(source_p, RPL_STATSCONN,
form_str (RPL_STATSCONN),
form_str(RPL_STATSULINE),
shared_p->server, shared_p->username,
shared_p->host, buf);
form_str(RPL_STATSULINE),
shared_p->server, shared_p->username,
shared_p->host, buf);
form_str(RPL_STATSULINE),
shared_p->server, "*", "*", buf);
}
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),
(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,
if(aconf->hold)
sendto_one_numeric(source_p, RPL_STATSXLINE,
form_str(RPL_STATSXLINE),
if(aconf->hold)
sendto_one_numeric(source_p, RPL_STATSXLINE,
form_str(RPL_STATSXLINE),
- 'x', aconf->port, aconf->name,
+ 'x', aconf->port, aconf->host,
if(!aconf->hold)
sendto_one_numeric(source_p, RPL_STATSXLINE,
form_str(RPL_STATSXLINE),
if(!aconf->hold)
sendto_one_numeric(source_p, RPL_STATSXLINE,
form_str(RPL_STATSXLINE),
- 'X', aconf->port, aconf->name,
+ 'X', aconf->port, aconf->host,
"z :Users %u(%lu) Invites %u(%lu)",
users_counted,
(unsigned long) users_counted * sizeof(struct User),
"z :Users %u(%lu) Invites %u(%lu)",
users_counted,
(unsigned long) users_counted * sizeof(struct User),
(unsigned long) users_invited_count * sizeof(rb_dlink_node));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
(unsigned long) users_invited_count * sizeof(rb_dlink_node));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
(unsigned long) class_count * sizeof(struct Class));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
(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),
"z :Channel members %u(%lu) invite %u(%lu)",
channel_users,
(unsigned long) channel_users * sizeof(rb_dlink_node),
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"z :Hash: client %u(%ld) chan %u(%ld)",
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"z :Hash: client %u(%ld) chan %u(%ld)",
CH_MAX, (long)(CH_MAX * sizeof(rb_dlink_list)));
sendto_one_numeric(source_p, RPL_STATSDEBUG,
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,
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,
sprintf(buf, "%.2f%%", zipstats->out_ratio);
sprintf(buf1, "%.2f%%", zipstats->in_ratio);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
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,
"(%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,
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
(rb_current_time() - target_p->localClient->lasttime) : 0,
IsOper (source_p) ? show_capabilities (target_p) : "TS");
}
(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)",
uptime = (rb_current_time() - startup_time);
snprintf(buf, sizeof buf, "%7.2f %s (%4.1f K/s)",
_GMKs (me.localClient->sendK),
(float) ((float) me.localClient->sendK / (float) uptime));
sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server send: %s", buf);
_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);
}
sendto_one_numeric(source_p, RPL_STATSDEBUG, "? :Server recv: %s", buf);
}
- 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);
- 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);
- stats_l_list(source_p, name, doall, wilds, &serv_list, statchar);
+ stats_l_list(source_p, name, doall, wilds, &serv_list, statchar, NULL);
/* ok, at this point theyre looking for a specific client whos on
* our server.. but it contains a wildcard. --fl
*/
/* 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);
static void
stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
static void
stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
- 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,
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,
(rb_current_time() - target_p->localClient->lasttime) : 0,
IsOper(source_p) ? show_capabilities(target_p) : "-");
}
(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,
(int) target_p->localClient->receiveM,
(int) target_p->localClient->receiveK,
rb_current_time() - target_p->localClient->firsttime,