[ViewVC] Diff of: svn/ircd-hybrid/trunk/modules/m

Comparing ircd-hybrid/trunk/modules/m_stats.c (file contents):
Revision 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs.
Revision 1968 by michael, Wed May 8 14:59:15 2013 UTC

+const char *from, *to;
-+
+static const struct shared_flags
-+
+{
-+
+  const unsigned int type;
-+
+  const unsigned char letter;
-+
+} flag_table[] = {
-+
+  { SHARED_KLINE,   'K' },
-+
+  { SHARED_UNKLINE, 'U' },
-+
+  { SHARED_XLINE,   'X' },
-+
+  { SHARED_UNXLINE, 'Y' },
-+
+  { SHARED_RESV,    'Q' },
-+
+  { SHARED_UNRESV,  'R' },
-+
+  { SHARED_LOCOPS,  'L' },
-+
+  { SHARED_DLINE,   'D' },
-+
+  { SHARED_UNDLINE, 'E' },
-+
+  { 0, '\0' }
-+
+};
-+
-+
+/*
-+
+ * inputs       - pointer to client requesting confitem report
-+
+ *              - ConfType to report
-+
+ * output       - none
-+
+ * side effects -
-+
+ */
-+
+static void
-+
+report_confitem_types(struct Client *source_p, enum maskitem_type type)
-+
+{
-+
+  dlink_node *ptr = NULL, *dptr = NULL;
-+
+  struct MaskItem *conf = NULL;
-+
+  const struct ClassItem *class = NULL;
-+
+  const struct shared_flags *shared = NULL;
-+
+  char buf[12];
-+
+  char *p = NULL;
-+
-+
+  switch (type)
-+
+  {
-+
+  case CONF_XLINE:
-+
+    DLINK_FOREACH(ptr, xconf_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      sendto_one(source_p, form_str(RPL_STATSXLINE),
-+
+                 me.name, source_p->name,
-+
+                 conf->until ? 'x': 'X', conf->count,
-+
+                 conf->name, conf->reason);
-+
+    }
-+
+    break;
-+
-+
+  case CONF_ULINE:
-+
+    shared = flag_table;
-+
+    DLINK_FOREACH(ptr, uconf_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      p = buf;
-+
-+
+      *p++ = 'c';
-+
+      for (; shared->type; ++shared)
-+
+        if (shared->type & conf->flags)
-+
+          *p++ = shared->letter;
-+
+        else
-+
+          *p++ = ToLower(shared->letter);
-+
-+
+      sendto_one(source_p, form_str(RPL_STATSULINE),
-+
+                 me.name, source_p->name, conf->name,
-+
+                 conf->user?conf->user: "*",
-+
+                 conf->host?conf->host: "*", buf);
-+
+    }
-+
-+
+    shared = flag_table;
-+
+    DLINK_FOREACH(ptr, cluster_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      p = buf;
-+
-+
+      *p++ = 'C';
-+
+      for (; shared->type; ++shared)
-+
+        if (shared->type & conf->flags)
-+
+          *p++ = shared->letter;
-+
+        else
-+
+          *p++ = ToLower(shared->letter);
-+
-+
+      sendto_one(source_p, form_str(RPL_STATSULINE),
-+
+                 me.name, source_p->name, conf->name,
-+
+                 "*", "*", buf);
-+
+    }
-+
-+
+    break;
-+
-+
+  case CONF_OPER:
-+
+    DLINK_FOREACH(ptr, oconf_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      /* Don't allow non opers to see oper privs */
-+
+      if (HasUMode(source_p, UMODE_OPER))
-+
+        sendto_one(source_p, form_str(RPL_STATSOLINE),
-+
+                   me.name, source_p->name, 'O', conf->count, conf->user, conf->host,
-+
+                   conf->name, oper_privs_as_string(conf->port),
-+
+                   conf->class ? conf->class->name : "<default>");
-+
+      else
-+
+        sendto_one(source_p, form_str(RPL_STATSOLINE),
-+
+                   me.name, source_p->name, 'O', conf->count, conf->user, conf->host,
-+
+                   conf->name, "0",
-+
+                   conf->class ? conf->class->name : "<default>");
-+
+    }
-+
+    break;
-+
-+
+  case CONF_CLASS:
-+
+    DLINK_FOREACH(ptr, class_get_list()->head)
-+
+    {
-+
+      class = ptr->data;
-+
+      sendto_one(source_p, form_str(RPL_STATSYLINE),
-+
+                 me.name, source_p->name, 'Y',
-+
+                 class->name, class->ping_freq,
-+
+                 class->con_freq,
-+
+                 class->max_total, class->max_sendq,
-+
+                 class->max_recvq,
-+
+                 class->ref_count,
-+
+                 class->number_per_cidr, class->cidr_bitlen_ipv4,
-+
+                 class->number_per_cidr, class->cidr_bitlen_ipv6,
-+
+                 class->active ? "active" : "disabled");
-+
+    }
-+
+    break;
-+
-+
+  case CONF_SERVICE:
-+
+    DLINK_FOREACH(ptr, service_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
+      sendto_one(source_p, form_str(RPL_STATSSERVICE),
-+
+                 me.name, source_p->name, 'S', "*", conf->name, 0, 0);
-+
+    }
-+
+    break;
-+
-+
+  case CONF_SERVER:
-+
+    DLINK_FOREACH(ptr, server_items.head)
-+
+    {
-+
+      p = buf;
-+
+      conf = ptr->data;
-+
-+
+      buf[0] = '\0';
-+
-+
+      if (IsConfAllowAutoConn(conf))
-+
+        *p++ = 'A';
-+
+      if (IsConfSSL(conf))
-+
+        *p++ = 'S';
-+
+      if (buf[0] == '\0')
-+
+        *p++ = '*';
-+
-+
+      *p = '\0';
-+
-+
+      /*
-+
+       * Allow admins to see actual ips unless hide_server_ips is enabled
-+
+       */
-+
+      if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
-+
+        sendto_one(source_p, form_str(RPL_STATSCLINE),
-+
+                   me.name, source_p->name, 'C', conf->host,
-+
+                   buf, conf->name, conf->port,
-+
+                   conf->class ? conf->class->name : "<default>");
-+
+        else
-+
+          sendto_one(source_p, form_str(RPL_STATSCLINE),
-+
+                     me.name, source_p->name, 'C',
-+
+                     "*@127.0.0.1", buf, conf->name, conf->port,
-+
+                     conf->class ? conf->class->name : "<default>");
-+
+    }
-+
+    break;
-+
-+
+  case CONF_HUB:
-+
+    DLINK_FOREACH(ptr, server_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      DLINK_FOREACH(dptr, conf->hub_list.head)
-+
+        sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
-+
+                   source_p->name, 'H', dptr->data, conf->name, 0, "*");
-+
+    }
-+
-+
+    DLINK_FOREACH(ptr, server_items.head)
-+
+    {
-+
+      conf = ptr->data;
-+
-+
+      DLINK_FOREACH(dptr, conf->leaf_list.head)
-+
+        sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
-+
+                   source_p->name, 'L', dptr->data, conf->name, 0, "*");
-+
+    }
-+
-+
+    break;
-+
-+
+  default:
-+
+    break;
-+
+  }
-+
+}
-+
-+
+/* report_resv()
-+
+ *
-+
+ * inputs       - pointer to client pointer to report to.
-+
+ * output       - NONE
-+
+ * side effects - report all resvs to client.
-+
+ */
-+
+static void
-+
+report_resv(struct Client *source_p)
-+
+{
-+
+  dlink_node *ptr = NULL;
-+
+  struct MaskItem *conf = NULL;
-+
-+
+  DLINK_FOREACH(ptr, resv_channel_list.head)
-+
+  {
-+
+    conf = ptr->data;
-+
+    sendto_one(source_p, form_str(RPL_STATSQLINE),
-+
+               me.name, source_p->name,
-+
+               conf->until ? 'q' : 'Q', conf->count,
-+
+               conf->name, conf->reason);
-+
+  }
-+
-+
+  DLINK_FOREACH(ptr, nresv_items.head)
-+
+  {
-+
+    conf = ptr->data;
-+
+    sendto_one(source_p, form_str(RPL_STATSQLINE),
-+
+               me.name, source_p->name,
-+
+               conf->until ? 'q' : 'Q', conf->count,
-+
+               conf->name, conf->reason);
-+
+  }
-+
+}
-+
+/*
+ * This is part of the STATS replies. There is no offical numeric for this
+ * since this isnt an official command, in much the same way as HASH isnt.
+    rup = 1;
+  sendto_one(source_p,
-<
+             ":%s %d %s R :CPU Secs %d:%d User %d:%d System %d:%d",
->
+             ":%s %d %s R :CPU Secs %d:%02d User %d:%02d System %d:%02d",
+             me.name, RPL_STATSDEBUG, source_p->name, (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));
+      if (conf->until)
+        continue;
-<
+      sendto_one(source_p, RPL_STATSDLINE,
->
+      sendto_one(source_p, form_str(RPL_STATSDLINE),
+                 from, to, 'D', conf->host, conf->reason);
+      if (!conf->until)
+        continue;
-<
+      sendto_one(source_p, RPL_STATSDLINE,
->
+      sendto_one(source_p, form_str(RPL_STATSDLINE),
+                 from, to, 'd', conf->host, conf->reason);
+  if (ConfigFileEntry.stats_e_disabled)
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+    return;
-+
+  for (i = 0; i < ATABLE_SIZE; ++i)
+    DLINK_FOREACH(ptr, atable[i].head)
+      conf = arec->conf;
-<
+      sendto_one(source_p, RPL_STATSDLINE,
-<
+                 from, to, 'e', conf->host, conf->reason /* XXX */);
->
+      sendto_one(source_p, form_str(RPL_STATSDLINE), from, to, 'e',
->
+                 conf->host, "");
+        const struct MaskItem *conf = arec->conf;
-<
+        sendto_one(source_p, RPL_STATSKLINE,
-<
+                   from, to, "G",
->
+        sendto_one(source_p, form_str(RPL_STATSKLINE),
->
+                   from, to, 'G',
+                   conf->host ? conf->host : "*",
+                   conf->user ? conf->user : "*",
+                   conf->reason ? conf->reason : CONF_NOREASON);
+       * sender, so prepare the strings for comparing --fl_
+       */
+      if (ConfigFileEntry.hide_spoof_ips)
-<
+        sendto_one(client_p, RPL_STATSILINE, me.name,
->
+        sendto_one(client_p, form_str(RPL_STATSILINE), me.name,
+                   client_p->name, 'I',
+                   conf->name == NULL ? "*" : conf->name,
+                   show_iline_prefix(client_p, conf),
+                   conf->class ? conf->class->name : "<default>");
+      else
-<
+        sendto_one(client_p, RPL_STATSILINE, me.name,
->
+        sendto_one(client_p, form_str(RPL_STATSILINE), me.name,
+                   client_p->name, 'I',
+                   conf->name == NULL ? "*" : conf->name,
+                   show_iline_prefix(client_p, conf),
+  /* Oper only, if unopered, return ERR_NOPRIVILEGES */
+  if ((ConfigFileEntry.stats_i_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+  /* If unopered, Only return matching auth blocks */
+    if (conf == NULL)
+      return;
-<
+    sendto_one(source_p, RPL_STATSILINE, from,
->
+    sendto_one(source_p, form_str(RPL_STATSILINE), from,
+               to, 'I',
+               "*", show_iline_prefix(source_p, conf),
+               conf->host, conf->port,
+  struct MaskItem *conf = NULL;
+  unsigned int i = 0;
-<
+  const char *p = NULL;
->
+  char c = '\0';
+  dlink_node *ptr = NULL;
+  if (tkline)
-<
+    p = "k";
->
+    c = 'k';
+  else
-<
+    p = "K";
->
+    c = 'K';
+  for (i = 0; i < ATABLE_SIZE; ++i)
+        continue;
+      if (HasUMode(client_p, UMODE_OPER))
-<
+        sendto_one(client_p, RPL_STATSKLINE, me.name,
-<
+                   client_p->name, p, conf->host, conf->user,
->
+        sendto_one(client_p, form_str(RPL_STATSKLINE), me.name,
->
+                   client_p->name, c, conf->host, conf->user,
+                   conf->reason);
+      else
-<
+        sendto_one(client_p, RPL_STATSKLINE, me.name,
-<
+                   client_p->name, p, conf->host, conf->user,
->
+        sendto_one(client_p, form_str(RPL_STATSKLINE), me.name,
->
+                   client_p->name, c, conf->host, conf->user,
+                   conf->reason);
+  /* Oper only, if unopered, return ERR_NOPRIVILEGES */
+  if ((ConfigFileEntry.stats_k_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+  /* If unopered, Only return matching klines */
+    if (!conf->until)
+      return;
-<
+    sendto_one(source_p, RPL_STATSKLINE, from,
-<
+               to, "k", conf->host, conf->user, conf->reason);
->
+    sendto_one(source_p, form_str(RPL_STATSKLINE), from,
->
+               to, 'k', conf->host, conf->user, conf->reason);
+  /* Theyre opered, or allowed to see all klines */
+  else {
+  /* Oper only, if unopered, return ERR_NOPRIVILEGES */
+  if ((ConfigFileEntry.stats_k_oper_only == 2) && !HasUMode(source_p, UMODE_OPER))
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+  /* If unopered, Only return matching klines */
+    if (conf->until)
+      return;
-<
+    sendto_one(source_p, RPL_STATSKLINE, from,
-<
+               to, "K", conf->host, conf->user, conf->reason);
->
+    sendto_one(source_p, form_str(RPL_STATSKLINE), from,
->
+               to, 'K', conf->host, conf->user, conf->reason);
+  /* Theyre opered, or allowed to see all klines */
-<
+  else {
->
+  else
+    report_Klines(source_p, 0);
-–
+    report_confitem_types(source_p, CONF_RKLINE);
-–
+  }
+static void
+stats_oper(struct Client *source_p, int parc, char *parv[])
+  if (!HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.stats_o_oper_only)
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+  else
+    report_confitem_types(source_p, CONF_OPER);
+stats_ports(struct Client *source_p, int parc, char *parv[])
+  if (!HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.stats_P_oper_only)
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+  else
+    show_ports(source_p);
+  const struct Client *target_p = NULL;
+  const dlink_node *ptr = NULL;
-–
+  struct ServerStatistics *sp;
+  struct ServerStatistics tmp;
-+
+  struct ServerStatistics *sp = &tmp;
-–
+  sp = &tmp;
+  memcpy(sp, &ServerStats, sizeof(struct ServerStatistics));
+  /*
+  time_t now = CurrentTime - me.localClient->since;
-<
+  sendto_one(source_p, RPL_STATSUPTIME, from, to,
->
+  sendto_one(source_p, form_str(RPL_STATSUPTIME), from, to,
+             now / 86400, (now / 3600) % 24, (now / 60) % 60, now % 60);
+  if (!ConfigFileEntry.disable_remote || HasUMode(source_p, UMODE_OPER))
-<
+     sendto_one(source_p, RPL_STATSCONN, from, to,
->
+     sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
+                Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
+stats_gecos(struct Client *source_p, int parc, char *parv[])
+  report_confitem_types(source_p, CONF_XLINE);
-–
+  report_confitem_types(source_p, CONF_RXLINE);
+static void
+  if (ConfigServerHide.flatten_links && !HasUMode(source_p, UMODE_OPER))
-<
+    sendto_one(source_p, ERR_NOPRIVILEGES,
->
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               from, to);
+    return;
+    struct Client *target_p = ptr->data;
-+
+    if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
-+
+      if (!HasUMode(source_p, UMODE_OPER))
-+
+        continue;
-+
+    sendB += target_p->localClient->send.bytes;
+    recvB += target_p->localClient->recv.bytes;
+    /* ":%s 211 %s %s %u %u %llu %u %llu :%u %u %s" */
-<
+    sendto_one(source_p, RPL_STATSLINKINFO,
->
+    sendto_one(source_p, form_str(RPL_STATSLINKINFO),
+               from, to,
+               get_client_name(target_p, HasUMode(source_p, UMODE_ADMIN) ? SHOW_IP : MASK_IP),
+               dbuf_length(&target_p->localClient->buf_sendq),
+       (!IsServer(target_p) && !HasUMode(target_p, UMODE_ADMIN) &&
+       !IsHandshake(target_p) && !IsConnecting(target_p))))
-<
+      sendto_one(source_p, RPL_STATSLINKINFO,
->
+      sendto_one(source_p, form_str(RPL_STATSLINKINFO),
+                 from, to,
+                 (IsUpper(statchar)) ?
+                 get_client_name(target_p, SHOW_IP) :
+      /* If its a hidden ip, an admin, or a server, mask the real IP */
+      if(IsIPSpoof(target_p) || IsServer(target_p) || HasUMode(target_p, UMODE_ADMIN)
+         || IsHandshake(target_p) || IsConnecting(target_p))
-<
+        sendto_one(source_p, RPL_STATSLINKINFO,
->
+        sendto_one(source_p, form_str(RPL_STATSLINKINFO),
+                   from, to,
+                   get_client_name(target_p, MASK_IP),
+                   dbuf_length(&target_p->localClient->buf_sendq),
+                   (CurrentTime > target_p->localClient->since) ? (unsigned)(CurrentTime - target_p->localClient->since):0,
+                   IsServer(target_p) ? show_capabilities(target_p) : "-");
+      else /* show the real IP */
-<
+        sendto_one(source_p, RPL_STATSLINKINFO,
->
+        sendto_one(source_p, form_str(RPL_STATSLINKINFO),
+                   from, to,
+                   (IsUpper(statchar)) ?
+                   get_client_name(target_p, SHOW_IP) :
+    stats_L(source_p, name, doall, wilds, statchar);
+  else
-<
+    sendto_one(source_p, ERR_NEEDMOREPARAMS,
->
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
+               from, to, "STATS");
+  { 'Q',        stats_resv,             1,      0       },
+  { 'r',        stats_usage,            1,      0       },
+  { 'R',        stats_usage,            1,      0       },
-+
+  { 's',        stats_service,          1,      0       },
+  { 'S',        stats_service,          1,      0       },
+  { 't',        stats_tstats,           1,      0       },
+  { 'T',        stats_tstats,           1,      0       },
+  if (statchar == '\0')
-<
+    sendto_one(source_p, RPL_ENDOFSTATS,
->
+    sendto_one(source_p, form_str(RPL_ENDOFSTATS),
+               from, to, '*');
+    return;
+      if ((tab->need_admin && !HasUMode(source_p, UMODE_ADMIN)) ||
+          (tab->need_oper && !HasUMode(source_p, UMODE_OPER)))
-<
+        sendto_one(source_p, ERR_NOPRIVILEGES,
->
+        sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+                   from, to);
+        break;
-<
+  sendto_one(source_p, RPL_ENDOFSTATS,
->
+  sendto_one(source_p, form_str(RPL_ENDOFSTATS),
+             from, to, statchar);
+  /* Check the user is actually allowed to do /stats, and isnt flooding */
+  if ((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
-<
+    sendto_one(source_p, RPL_LOAD2HI,
->
+    sendto_one(source_p,form_str(RPL_LOAD2HI),
+               from, to);
+    return;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing ircd-hybrid/trunk/modules/m_stats.c (file contents): Revision 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs. Revision 1968 by michael, Wed May 8 14:59:15 2013 UTC

Diff Legend

Comparing ircd-hybrid/trunk/modules/m_stats.c (file contents):
Revision 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs.
Revision 1968 by michael, Wed May 8 14:59:15 2013 UTC