Author: LordLuke <lordluke@undernet.org>

[ircu2.10.12-pk.git] / ircd / client.c

diff --git a/ircd/client.c b/ircd/client.c
index b1ed01f9aa7b4608eadd37d55c098b0ed60c672c..db6ce6fb4ed19a72e7f6e51bc13abde9cdc788d7 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -18,6 +18,8 @@
  *
  * $Id$
  */
+#include "config.h"
+
 #include "client.h"
 #include "class.h"
 #include "ircd.h"
@@ -32,6 +34,7 @@
 #include "struct.h"
 
 #include <assert.h>
+#include <string.h>
 
 #define BAD_PING                ((unsigned int)-2)
 
@@ -46,6 +49,8 @@ int client_get_ping(const struct Client* acptr)
   struct ConfItem* aconf;
   struct SLink*    link;
 
+  assert(cli_verify(acptr));
+
   for (link = cli_confs(acptr); link; link = link->next) {
     aconf = link->value.aconf;
     if (aconf->status & (CONF_CLIENT | CONF_SERVER)) {
@@ -55,9 +60,10 @@ int client_get_ping(const struct Client* acptr)
     }
   }
   if (0 == ping)
-    ping = PINGFREQUENCY;
+    ping = feature_int(FEAT_PINGFREQUENCY);
 
   Debug((DEBUG_DEBUG, "Client %s Ping %d", cli_name(acptr), ping));
+
   return ping;
 }
 
@@ -100,10 +106,11 @@ static struct {
   enum Feature feat;
   unsigned int flag;
 } feattab[] = {
-  { (PRIV_WHOX | PRIV_DISPLAY), FEAT_LAST_F, (FLAGS_OPER | FLAGS_LOCOP) },
+  { PRIV_WHOX, FEAT_LAST_F, (FLAGS_OPER | FLAGS_LOCOP) },
+  { PRIV_DISPLAY, FEAT_LAST_F, (FLAGS_OPER | FLAGS_LOCOP) },
   { PRIV_CHAN_LIMIT, FEAT_OPER_NO_CHAN_LIMIT, (FLAGS_OPER | FLAGS_LOCOP) },
-  { (PRIV_MODE_LCHAN | PRIV_LOCAL_OPMODE), FEAT_OPER_MODE_LCHAN,
-    (FLAGS_OPER | FLAGS_LOCOP) },
+  { PRIV_MODE_LCHAN, FEAT_OPER_MODE_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
+  { PRIV_LOCAL_OPMODE, FEAT_OPER_MODE_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
   { PRIV_WALK_LCHAN, FEAT_OPER_WALK_THROUGH_LMODES,
     (FLAGS_OPER | FLAGS_LOCOP) },
   { PRIV_DEOP_LCHAN, FEAT_NO_OPER_DEOP_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
@@ -111,13 +118,18 @@ static struct {
   { PRIV_SHOW_ALL_INVIS, FEAT_SHOW_ALL_INVISIBLE_USERS,
     (FLAGS_OPER | FLAGS_LOCOP) },
   { PRIV_UNLIMIT_QUERY, FEAT_UNLIMIT_OPER_QUERY, (FLAGS_OPER | FLAGS_LOCOP) },
+  { PRIV_LIST_CHAN, FEAT_LIST_CHAN, (FLAGS_OPER | FLAGS_LOCOP) },
 
   { PRIV_KILL, FEAT_LOCAL_KILL_ONLY, 0 },
-  { (PRIV_GLINE | PRIV_JUPE | PRIV_OPMODE | PRIV_BADCHAN),
-    FEAT_CONFIG_OPERCMDS, ~0 },
+  { PRIV_GLINE, FEAT_CONFIG_OPERCMDS, ~0 },
+  { PRIV_JUPE, FEAT_CONFIG_OPERCMDS, ~0 },
+  { PRIV_OPMODE, FEAT_CONFIG_OPERCMDS, ~0 },
+  { PRIV_BADCHAN, FEAT_CONFIG_OPERCMDS, ~0 },
 
-  { (PRIV_PROPAGATE | PRIV_SEE_OPERS), FEAT_LAST_F, FLAGS_OPER },
-  { (PRIV_KILL | PRIV_LOCAL_KILL), FEAT_OPER_KILL, FLAGS_OPER },
+  { PRIV_PROPAGATE, FEAT_LAST_F, FLAGS_OPER },
+  { PRIV_SEE_OPERS, FEAT_LAST_F, FLAGS_OPER },
+  { PRIV_KILL, FEAT_OPER_KILL, FLAGS_OPER },
+  { PRIV_LOCAL_KILL, FEAT_OPER_KILL, FLAGS_OPER },
   { PRIV_REHASH, FEAT_OPER_REHASH, FLAGS_OPER },
   { PRIV_RESTART, FEAT_OPER_RESTART, FLAGS_OPER },
   { PRIV_DIE, FEAT_OPER_DIE, FLAGS_OPER },
@@ -131,6 +143,7 @@ static struct {
   { PRIV_LOCAL_BADCHAN, FEAT_OPER_LBADCHAN, FLAGS_OPER },
   { PRIV_SET, FEAT_OPER_SET, FLAGS_OPER },
   { PRIV_SEE_CHAN, FEAT_OPERS_SEE_IN_SECRET_CHANNELS, FLAGS_OPER },
+  { PRIV_WIDE_GLINE, FEAT_OPER_WIDE_GLINE, FLAGS_OPER },
 
   { PRIV_LOCAL_KILL, FEAT_LOCOP_KILL, FLAGS_LOCOP },
   { PRIV_REHASH, FEAT_LOCOP_REHASH, FLAGS_LOCOP },
@@ -142,6 +155,7 @@ static struct {
   { PRIV_LOCAL_BADCHAN, FEAT_LOCOP_LBADCHAN, FLAGS_LOCOP },
   { PRIV_SET, FEAT_LOCOP_SET, FLAGS_LOCOP },
   { PRIV_SEE_CHAN, FEAT_LOCOP_SEE_IN_SECRET_CHANNELS, FLAGS_LOCOP },
+  { PRIV_WIDE_GLINE, FEAT_LOCOP_WIDE_GLINE, FLAGS_LOCOP },
   { 0, FEAT_LAST_F, 0 }
 };
 
@@ -152,15 +166,19 @@ static struct {
 void
 client_set_privs(struct Client* client)
 {
-  unsigned int privs = 0;
-  unsigned int antiprivs = 0;
+  struct Privs privs;
+  struct Privs antiprivs;
   int i;
 
-  if (!IsAnOper(client)) {
-    cli_privs(client) = 0; /* clear privilege mask */
+  memset(&privs, 0, sizeof(struct Privs));
+  memset(&antiprivs, 0, sizeof(struct Privs));
+
+  if (!IsAnOper(client)) { /* clear privilege mask */
+    memset(&(cli_privs(client)), 0, sizeof(struct Privs));
     return;
   } else if (!MyConnect(client)) {
-    cli_privs(client) = ~(PRIV_SET); /* everything but set... */
+    memset(&(cli_privs(client)), 255, sizeof(struct Privs));
+    PrivClr(&(cli_privs(client)), PRIV_SET);
     return;
   }
 
@@ -169,26 +187,33 @@ client_set_privs(struct Client* client)
   for (i = 0; feattab[i].priv; i++) {
     if (feattab[i].flag == 0) {
       if (feature_bool(feattab[i].feat))
-       antiprivs |= feattab[i].priv;
+       PrivSet(&antiprivs, feattab[i].priv);
     } else if (feattab[i].flag == ~0) {
       if (!feature_bool(feattab[i].feat))
-       antiprivs |= feattab[i].priv;
+       PrivSet(&antiprivs, feattab[i].priv);
     } else if (cli_flags(client) & feattab[i].flag) {
       if (feattab[i].feat == FEAT_LAST_F ||
          feature_bool(feattab[i].feat))
-       privs |= feattab[i].priv;
+       PrivSet(&privs, feattab[i].priv);
     }
   }
 
   /* This is the end of the gross section */
 
-  if (privs & PRIV_PROPAGATE)
-    privs |= PRIV_DISPLAY; /* force propagating opers to display */
-  else /* if they don't propagate oper status, prevent desyncs */
-    antiprivs |= (PRIV_KILL | PRIV_GLINE | PRIV_JUPE | PRIV_OPMODE |
-                 PRIV_BADCHAN);
+  if (PrivHas(&privs, PRIV_PROPAGATE))
+    PrivSet(&privs, PRIV_DISPLAY); /* force propagating opers to display */
+  else { /* if they don't propagate oper status, prevent desyncs */
+    PrivSet(&antiprivs, PRIV_KILL);
+    PrivSet(&antiprivs, PRIV_GLINE);
+    PrivSet(&antiprivs, PRIV_JUPE);
+    PrivSet(&antiprivs, PRIV_OPMODE);
+    PrivSet(&antiprivs, PRIV_BADCHAN);
+  }
+
+  for (i = 0; i <= _PRIV_IDX(PRIV_LAST_PRIV); i++)
+    privs.priv_mask[i] &= ~antiprivs.priv_mask[i];
 
-  cli_privs(client) = privs & ~antiprivs;
+  cli_privs(client) = privs;
 }
 
 static struct {
@@ -202,7 +227,7 @@ static struct {
   P(GLINE),          P(LOCAL_GLINE),    P(JUPE),          P(LOCAL_JUPE),
   P(OPMODE),         P(LOCAL_OPMODE),   P(SET),           P(WHOX),
   P(BADCHAN),        P(LOCAL_BADCHAN),  P(SEE_CHAN),      P(PROPAGATE),
-  P(DISPLAY),        P(SEE_OPERS),
+  P(DISPLAY),        P(SEE_OPERS),      P(WIDE_GLINE),
 #undef P
   { 0, 0 }
 };
@@ -222,7 +247,7 @@ client_report_privs(struct Client *to, struct Client *client)
                 cli_name(client));
 
   for (i = 0; privtab[i].name; i++)
-    if (cli_privs(client) & privtab[i].priv)
+    if (HasPriv(client, privtab[i].priv))
       msgq_append(0, mb, "%s%s", found1++ ? " " : "", privtab[i].name);
 
   send_buffer(to, mb, 0); /* send response */