* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_stats.c 1608 2006-06-04 02:11:40Z jilles $
*/
#include "stdinc.h"
#include "class.h" /* report_classes */
#include "client.h" /* Client */
#include "common.h" /* TRUE/FALSE */
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h" /* me */
#include "listener.h" /* show_ports */
-#include "s_gline.h"
#include "msg.h" /* Message */
#include "hostmask.h" /* report_mtrie_conf_links */
#include "numeric.h" /* ERR_xxx */
struct StatsStruct
{
char letter;
- void (*handler) ();
+ void (*handler) (struct Client *source_p);
int need_oper;
int need_admin;
};
-static void stats_dns_servers (struct Client *);
+static void stats_dns_servers(struct Client *);
static void stats_delay(struct Client *);
static void stats_hash(struct Client *);
static void stats_connect(struct Client *);
static void stats_deny(struct Client *);
static void stats_exempt(struct Client *);
static void stats_events(struct Client *);
-static void stats_glines(struct Client *);
-static void stats_pending_glines(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_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 *);
{'E', stats_events, 1, 1, },
{'f', stats_comm, 1, 1, },
{'F', stats_comm, 1, 1, },
- {'g', stats_pending_glines, 1, 0, },
- {'G', stats_glines, 1, 0, },
+ {'g', stats_prop_klines, 1, 0, },
{'h', stats_hubleaf, 0, 0, },
{'H', stats_hubleaf, 0, 0, },
{'i', stats_auth, 0, 0, },
{'I', stats_auth, 0, 0, },
{'k', stats_tklines, 0, 0, },
{'K', stats_klines, 0, 0, },
- {'l', stats_ltrace, 0, 0, },
- {'L', stats_ltrace, 0, 0, },
+ {'l', NULL /* special */, 0, 0, },
+ {'L', NULL /* special */, 0, 0, },
{'m', stats_messages, 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, },
/*
* m_stats by fl_
- * parv[0] = sender prefix
* parv[1] = stat letter/command
* parv[2] = (if present) server/mask in stats L, or target
*
if((statchar != 'L') && (statchar != 'l'))
stats_spy(source_p, statchar, NULL);
- for (i = 0; stats_cmd_table[i].handler; i++)
+ for (i = 0; stats_cmd_table[i].letter; i++)
{
if(stats_cmd_table[i].letter == statchar)
{
/* Blah, stats L needs the parameters, none of the others do.. */
if(statchar == 'L' || statchar == 'l')
- stats_cmd_table[i].handler (source_p, parc, parv);
+ stats_ltrace (source_p, parc, parv);
else
stats_cmd_table[i].handler (source_p);
}
{
if(ServerConfAutoconn(server_p))
*s++ = 'A';
+ if(ServerConfSSL(server_p))
+ *s++ = 'S';
if(ServerConfTb(server_p))
*s++ = 'T';
if(ServerConfCompressed(server_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);
}
rb_dump_events(stats_events_cb, source_p);
}
-/* stats_pending_glines()
- *
- * input - client pointer
- * output - none
- * side effects - client is shown list of pending glines
- */
static void
-stats_pending_glines (struct Client *source_p)
+stats_prop_klines(struct Client *source_p)
{
- if(ConfigFileEntry.glines)
- {
- rb_dlink_node *pending_node;
- struct gline_pending *glp_ptr;
- char timebuffer[MAX_DATE_STRING];
- struct tm *tmptr;
-
- RB_DLINK_FOREACH (pending_node, pending_glines.head)
- {
- glp_ptr = pending_node->data;
-
- tmptr = localtime (&glp_ptr->time_request1);
- strftime (timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
-
- sendto_one_notice(source_p,
- ":1) %s!%s@%s on %s requested gline at %s for %s@%s [%s]",
- glp_ptr->oper_nick1,
- glp_ptr->oper_user1, glp_ptr->oper_host1,
- glp_ptr->oper_server1, timebuffer,
- glp_ptr->user, glp_ptr->host, glp_ptr->reason1);
-
- if(glp_ptr->oper_nick2[0])
- {
- tmptr = localtime (&glp_ptr->time_request2);
- strftime (timebuffer, MAX_DATE_STRING, "%Y/%m/%d %H:%M:%S", tmptr);
- sendto_one_notice(source_p,
- ":2) %s!%s@%s on %s requested gline at %s for %s@%s [%s]",
- glp_ptr->oper_nick2,
- glp_ptr->oper_user2, glp_ptr->oper_host2,
- glp_ptr->oper_server2, timebuffer,
- glp_ptr->user, glp_ptr->host, glp_ptr->reason2);
- }
- }
+ struct ConfItem *aconf;
+ rb_dlink_node *ptr;
+ char *user, *host, *pass, *oper_reason;
- if(rb_dlink_list_length (&pending_glines) > 0)
- sendto_one_notice(source_p, ":End of Pending G-lines");
- }
- else
- sendto_one_notice(source_p, ":This server does not support G-Lines");
+ RB_DLINK_FOREACH(ptr, prop_bans.head)
+ {
+ aconf = ptr->data;
-}
+ /* Skip non-klines and deactivated klines. */
+ if(aconf->status != CONF_KILL)
+ continue;
-/* stats_glines()
- *
- * input - client pointer
- * output - none
- * side effects - client is shown list of glines
- */
-static void
-stats_glines (struct Client *source_p)
-{
- if(ConfigFileEntry.glines)
- {
- rb_dlink_node *gline_node;
- struct ConfItem *kill_ptr;
+ get_printable_kline(source_p, aconf, &host, &pass,
+ &user, &oper_reason);
- RB_DLINK_FOREACH_PREV (gline_node, glines.tail)
- {
- kill_ptr = gline_node->data;
-
- sendto_one_numeric(source_p, RPL_STATSKLINE,
- form_str(RPL_STATSKLINE), 'G',
- kill_ptr->host ? kill_ptr->host : "*",
- kill_ptr->user ? kill_ptr->user : "*",
- kill_ptr->passwd ? kill_ptr->passwd : "No Reason",
- kill_ptr->spasswd ? "|" : "",
- kill_ptr->spasswd ? kill_ptr->spasswd : "");
- }
+ sendto_one_numeric(source_p, RPL_STATSKLINE,
+ form_str(RPL_STATSKLINE),
+ 'g', host, user, pass,
+ oper_reason ? "|" : "",
+ oper_reason ? oper_reason : "");
}
- else
- sendto_one_notice(source_p, ":This server does not support G-Lines");
}
-
static void
stats_hubleaf(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))
(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);
}
(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;
(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;
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()
*
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)
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
}
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)
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
}
sp.is_sbs += target_p->localClient->sendB;
sp.is_sbr += target_p->localClient->receiveB;
- sp.is_sks += target_p->localClient->sendK;
- sp.is_skr += target_p->localClient->receiveK;
- 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++;
- if(sp.is_sbs > 1023)
- {
- sp.is_sks += (sp.is_sbs >> 10);
- sp.is_sbs &= 0x3ff;
- }
- if(sp.is_sbr > 1023)
- {
- sp.is_skr += (sp.is_sbr >> 10);
- sp.is_sbr &= 0x3ff;
- }
}
RB_DLINK_FOREACH(ptr, lclient_list.head)
sp.is_cbs += target_p->localClient->sendB;
sp.is_cbr += target_p->localClient->receiveB;
- sp.is_cks += target_p->localClient->sendK;
- sp.is_ckr += target_p->localClient->receiveK;
- 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++;
- if(sp.is_cbs > 1023)
- {
- sp.is_cks += (sp.is_cbs >> 10);
- sp.is_cbs &= 0x3ff;
- }
- if(sp.is_cbr > 1023)
- {
- sp.is_ckr += (sp.is_cbr >> 10);
- sp.is_cbr &= 0x3ff;
- }
-
}
RB_DLINK_FOREACH(ptr, unknown_list.head)
"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());
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"T :connected %u %u", sp.is_cl, sp.is_sv);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "T :bytes sent %d.%uK %d.%uK",
- (int) sp.is_cks, sp.is_cbs,
- (int) sp.is_sks, sp.is_sbs);
+ "T :bytes sent %lluK %lluK",
+ sp.is_cbs / 1024,
+ sp.is_sbs / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "T :bytes recv %d.%uK %d.%uK",
- (int) sp.is_ckr, sp.is_cbr,
- (int) sp.is_skr, sp.is_sbr);
+ "T :bytes recv %lluK %lluK",
+ sp.is_cbr / 1024,
+ sp.is_sbr / 1024);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "T :time connected %d %d",
- (int) sp.is_cti, (int) sp.is_sti);
+ "T :time connected %llu %llu",
+ sp.is_cti, sp.is_sti);
}
static void
{ SHARED_UNRESV, 'R' },
{ SHARED_LOCOPS, 'L' },
{ SHARED_REHASH, 'H' },
+ { SHARED_TDLINE, 'd' },
+ { SHARED_PDLINE, 'D' },
+ { SHARED_UNDLINE, 'E' },
+ { SHARED_DIE, 'I' },
+ { SHARED_MODULE, 'M' },
{ 0, '\0'}
};
{
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;
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);
}
}
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);
}
}
{
rb_dlink_node *ptr;
struct Client *target_p;
+ struct ZipStats *zipstats;
int sent_data = 0;
char buf[128], buf1[128];
-
RB_DLINK_FOREACH (ptr, serv_list.head)
{
target_p = ptr->data;
if(IsCapable (target_p, CAP_ZIP))
{
- /* we use memcpy(3) and a local copy of the structure to
- * work around a register use bug on GCC on the SPARC.
- * -jmallett, 04/27/2002
- */
- struct ZipStats zipstats;
- memcpy (&zipstats, &target_p->localClient->zipstats,
- sizeof (struct ZipStats));
- snprintf(buf, sizeof buf, "%.2f%%", zipstats.out_ratio);
- snprintf(buf1, sizeof buf1, "%.2f%%", zipstats.in_ratio);
-
+ zipstats = target_p->localClient->zipstats;
+ sprintf(buf, "%.2f%%", zipstats->out_ratio);
+ sprintf(buf1, "%.2f%%", zipstats->in_ratio);
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"Z :ZipLinks stats for %s send[%s compression "
- "(%lu kB data/%lu kB wire)] recv[%s compression "
- "(%lu kB data/%lu kB wire)]",
+ "(%llu kB data/%llu kB wire)] recv[%s compression "
+ "(%llu kB data/%llu kB wire)]",
target_p->name,
- buf, zipstats.outK, zipstats.outK_wire,
- buf1, zipstats.inK, zipstats.inK_wire);
+ buf, zipstats->out >> 10,
+ zipstats->out_wire >> 10, buf1,
+ zipstats->in >> 10, zipstats->in_wire >> 10);
sent_data++;
}
}
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,
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,
projects / irc / rqf / shadowircd.git / blobdiff