const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
static void stats_l_list(struct Client *s, const char *, bool, bool, rb_dlink_list *, char,
- bool (*check_fn)(struct Client *target_p));
+ bool (*check_fn)(struct Client *source_p, struct Client *target_p));
static void stats_l_client(struct Client *source_p, struct Client *target_p,
char statchar);
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_klines(struct Client *);
static void stats_ports(struct Client *);
static void stats_tresv(struct Client *);
static void stats_resv(struct Client *);
+static void stats_secure(struct Client *);
static void stats_ssld(struct Client *);
static void stats_usage(struct Client *);
static void stats_tstats(struct Client *);
static void stats_uptime(struct Client *);
-static void stats_shared(struct Client *);
static void stats_servers(struct Client *);
static void stats_tgecos(struct Client *);
static void stats_gecos(struct Client *);
['f'] = HANDLER_NORM(stats_comm, true, NULL),
['F'] = HANDLER_NORM(stats_comm, true, NULL),
['g'] = HANDLER_NORM(stats_prop_klines, false, "oper:general"),
- ['h'] = HANDLER_NORM(stats_hubleaf, false, NULL),
- ['H'] = HANDLER_NORM(stats_hubleaf, false, NULL),
['i'] = HANDLER_NORM(stats_auth, false, NULL),
['I'] = HANDLER_NORM(stats_auth, false, NULL),
['k'] = HANDLER_NORM(stats_tklines, false, NULL),
['Q'] = HANDLER_NORM(stats_resv, false, "oper:general"),
['r'] = HANDLER_NORM(stats_usage, false, "oper:general"),
['R'] = HANDLER_NORM(stats_usage, false, "oper:general"),
- ['s'] = HANDLER_NORM(stats_ssld, true, NULL),
+ ['s'] = HANDLER_NORM(stats_secure, false, "oper:general"),
['S'] = HANDLER_NORM(stats_ssld, true, NULL),
['t'] = HANDLER_NORM(stats_tstats, false, "oper:general"),
['T'] = HANDLER_NORM(stats_tstats, false, "oper:general"),
['u'] = HANDLER_NORM(stats_uptime, false, NULL),
- ['U'] = HANDLER_NORM(stats_shared, false, "oper:general"),
['v'] = HANDLER_NORM(stats_servers, false, NULL),
['V'] = HANDLER_NORM(stats_servers, false, NULL),
['x'] = HANDLER_NORM(stats_tgecos, false, "oper:general"),
if(cmd->handler != NULL)
{
/* The stats table says what privs are needed, so check --fl_ */
- /* Called for remote clients and for local opers, so check need_admin
- * and need_oper
- */
const char *missing_priv = NULL;
if(cmd->need_admin && !IsOperAdmin(source_p))
missing_priv = "admin";
RB_DLINK_FOREACH(n, nameservers.head)
{
- sendto_one_numeric(source_p, RPL_STATSDEBUG, "A %s", (char *)n->data);
+ sendto_one_numeric(source_p, RPL_STATSDEBUG, "A :%s", (char *)n->data);
}
}
'e', host, pass, "", "");
}
}
- }}
+ }
+}
static void
}
}
-static void
-stats_hubleaf(struct Client *source_p)
-{
- struct remote_conf *hub_p;
- rb_dlink_node *ptr;
-
- if((ConfigFileEntry.stats_h_oper_only ||
- (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
- !IsOperGeneral(source_p))
- {
- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
- form_str (ERR_NOPRIVILEGES));
- return;
- }
-
- RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
- {
- hub_p = ptr->data;
-
- if(hub_p->flags & CONF_HUB)
- sendto_one_numeric(source_p, RPL_STATSHLINE,
- form_str(RPL_STATSHLINE),
- hub_p->host, hub_p->server);
- else
- sendto_one_numeric(source_p, RPL_STATSLLINE,
- form_str(RPL_STATSLLINE),
- hub_p->host, hub_p->server);
- }
-}
-
-
static void
stats_auth (struct Client *source_p)
{
}
}
+static void
+stats_secure(struct Client *source_p)
+{
+ struct AddressRec *arec;
+ struct ConfItem *aconf;
+ size_t i;
+
+ for (i = 0; i < ATABLE_SIZE; i++)
+ {
+ for (arec = atable[i]; arec; arec = arec->next)
+ {
+ if(arec->type == CONF_SECURE)
+ {
+ aconf = arec->aconf;
+ sendto_one_numeric(source_p, RPL_STATSDEBUG, "s :%s", aconf->host);
+ }
+ }
+ }
+}
+
static void
stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status, const char *version)
{
Count.totalrestartcount);
}
-struct shared_flags
-{
- int flag;
- char letter;
-};
-static struct shared_flags shared_flagtable[] =
-{
- { SHARED_PKLINE, 'K' },
- { SHARED_TKLINE, 'k' },
- { SHARED_UNKLINE, 'U' },
- { SHARED_PXLINE, 'X' },
- { SHARED_TXLINE, 'x' },
- { SHARED_UNXLINE, 'Y' },
- { SHARED_PRESV, 'Q' },
- { SHARED_TRESV, 'q' },
- { SHARED_UNRESV, 'R' },
- { SHARED_LOCOPS, 'L' },
- { SHARED_REHASH, 'H' },
- { SHARED_TDLINE, 'd' },
- { SHARED_PDLINE, 'D' },
- { SHARED_UNDLINE, 'E' },
- { SHARED_GRANT, 'G' },
- { SHARED_DIE, 'I' },
- { 0, '\0'}
-};
-
-
-static void
-stats_shared (struct Client *source_p)
-{
- struct remote_conf *shared_p;
- rb_dlink_node *ptr;
- char buf[sizeof(shared_flagtable)/sizeof(shared_flagtable[0])];
- char *p;
- int i;
-
- RB_DLINK_FOREACH(ptr, shared_conf_list.head)
- {
- shared_p = ptr->data;
-
- p = buf;
-
- *p++ = 'c';
-
- for(i = 0; shared_flagtable[i].flag != 0; i++)
- {
- if(shared_p->flags & shared_flagtable[i].flag)
- *p++ = shared_flagtable[i].letter;
- }
-
- *p = '\0';
-
- sendto_one_numeric(source_p, RPL_STATSULINE,
- form_str(RPL_STATSULINE),
- shared_p->server, shared_p->username,
- shared_p->host, buf);
- }
-
- RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
- {
- shared_p = ptr->data;
-
- p = buf;
-
- *p++ = 'C';
-
- for(i = 0; shared_flagtable[i].flag != 0; i++)
- {
- if(shared_p->flags & shared_flagtable[i].flag)
- *p++ = shared_flagtable[i].letter;
- }
-
- *p = '\0';
-
- sendto_one_numeric(source_p, RPL_STATSULINE,
- form_str(RPL_STATSULINE),
- shared_p->server, "*", "*", buf);
- }
-}
/* stats_servers()
*
}
static inline bool
-stats_l_should_show_oper(struct Client *target_p)
+stats_l_should_show_oper(struct Client *source_p, struct Client *target_p)
{
- return (!IsOperInvis(target_p));
+ return SeesOper(target_p, source_p);
}
static void
const char *name;
char statchar = parv[1][0];
+ if (ConfigFileEntry.stats_l_oper_only == STATS_L_OPER_ONLY_YES && !IsOperGeneral(source_p))
+ {
+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+ return;
+ }
+
/* this is def targeted at us somehow.. */
- if(parc > 2 && !EmptyString(parv[2]))
+ if (parc > 2 && !EmptyString(parv[2]))
{
/* directed at us generically? */
- if(match(parv[2], me.name) ||
- (!MyClient(source_p) && !irccmp(parv[2], me.id)))
+ if (match(parv[2], me.name) || (!MyClient(source_p) && !irccmp(parv[2], me.id)))
{
name = me.name;
doall = true;
}
/* must be directed at a specific person thats not us */
- if(!doall && !wilds)
+ if (!doall && !wilds)
{
struct Client *target_p;
- if(MyClient(source_p))
+ if (MyClient(source_p))
target_p = find_named_person(name);
else
target_p = find_person(name);
- if(target_p != NULL)
+ if (target_p != source_p && ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO
+ && !IsOperGeneral(source_p))
+ {
+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+ }
+ else if (target_p != NULL)
{
stats_spy(source_p, statchar, target_p->name);
stats_l_client(source_p, target_p, statchar);
}
else
+ {
sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
form_str(ERR_NOSUCHSERVER),
name);
+ }
return;
}
stats_spy(source_p, statchar, name);
- if(doall)
+ if (ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO && !IsOperGeneral(source_p))
+ {
+ if (doall && MyClient(source_p))
+ stats_l_client(source_p, source_p, statchar);
+ else
+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+ return;
+ }
+
+ if (doall)
{
/* local opers get everyone */
if(MyOper(source_p))
static void
stats_l_list(struct Client *source_p, const char *name, bool doall, bool wilds,
- rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *target_p))
+ rb_dlink_list * list, char statchar, bool (*check_fn)(struct Client *source_p, struct Client *target_p))
{
rb_dlink_node *ptr;
struct Client *target_p;
if(!doall && wilds && !match(name, target_p->name))
continue;
- if (check_fn == NULL || check_fn(target_p))
+ if (check_fn == NULL || check_fn(source_p, target_p))
stats_l_client(source_p, target_p, statchar);
}
}