tweaks

[irc/evilnet/x3.git] / src / hash.h

diff --git a/src/hash.h b/src/hash.h
index 1cceb219d7af5d10d4b85500ff0a269ce594f603..8bfee089aecad76a9e3cefcc6b5f5e32e76f61f6 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -37,7 +37,7 @@
 #define MODE_BAN               0x00000200 /* +b BAN */
 #define MODE_LIMIT             0x00000400 /* +l LIMIT */
 #define MODE_DELAYJOINS         0x00000800 /* +D */
-#define MODE_REGONLY            0x00001000 /* ircu +r, Bahamut +R */
+#define MODE_REGONLY            0x00001000 /* ircu +r */
 #define MODE_NOCOLORS           0x00002000 /* +c */
 #define MODE_NOCTCPS            0x00004000 /* +C */
 #define MODE_REGISTERED         0x00008000 /* Bahamut +r */
@@ -115,6 +115,59 @@
 /* IDLEN is 6 because it takes 5.33 Base64 digits to store 32 bytes. */
 #define IDLEN           6
 
+/** Operator privileges. */
+enum Priv {
+  PRIV_CHAN_LIMIT,      /**< no channel limit on oper */
+  PRIV_MODE_LCHAN,      /**< oper can mode local chans */
+  PRIV_WALK_LCHAN,      /**< oper can walk through local modes */
+  PRIV_DEOP_LCHAN,      /**< no deop oper on local chans */
+  PRIV_SHOW_INVIS,      /**< show local invisible users */
+  PRIV_SHOW_ALL_INVIS,  /**< show all invisible users */
+  PRIV_UNLIMIT_QUERY,   /**< unlimit who queries */
+  PRIV_KILL,            /**< oper can KILL */
+  PRIV_LOCAL_KILL,      /**< oper can local KILL */
+  PRIV_REHASH,          /**< oper can REHASH */
+  PRIV_REMOTEREHASH,    /**< oper can remote REHASH */
+  PRIV_RESTART,         /**< oper can RESTART */
+  PRIV_DIE,             /**< oper can DIE */
+  PRIV_GLINE,           /**< oper can GLINE */
+  PRIV_LOCAL_GLINE,     /**< oper can local GLINE */
+  PRIV_SHUN,            /**< oper can SHUN */
+  PRIV_LOCAL_SHUN,      /**< oper can local SHUN */
+  PRIV_JUPE,            /**< oper can JUPE */
+  PRIV_LOCAL_JUPE,      /**< oper can local JUPE */
+  PRIV_OPMODE,          /**< oper can OP/CLEARMODE */
+  PRIV_LOCAL_OPMODE,    /**< oper can local OP/CLEARMODE */
+  PRIV_SET,             /**< oper can SET */
+  PRIV_WHOX,            /**< oper can use /who x */
+  PRIV_BADCHAN,         /**< oper can BADCHAN */
+  PRIV_LOCAL_BADCHAN,   /**< oper can local BADCHAN */
+  PRIV_SEE_CHAN,        /**< oper can see in secret chans */
+  PRIV_PROPAGATE,       /**< propagate oper status */
+  PRIV_DISPLAY,         /**< "Is an oper" displayed */
+  PRIV_SEE_OPERS,       /**< display hidden opers */
+  PRIV_WIDE_GLINE,      /**< oper can set wider G-lines */
+  PRIV_WIDE_SHUN,       /**< oper can set wider G-lines */
+  PRIV_LIST_CHAN,       /**< oper can list secret channels */
+  PRIV_FORCE_OPMODE,    /**< can hack modes on quarantined channels */
+  PRIV_FORCE_LOCAL_OPMODE, /**< can hack modes on quarantined local channels */
+  PRIV_CHECK,           /**< oper can use CHECK */
+  PRIV_SEE_SECRET_CHAN, /**< oper can see +s channels in whois */
+  PRIV_LAST_PRIV        /**< number of privileges */
+};
+
+/** Number of bits */
+#define _PRIV_NBITS             (8 * sizeof(unsigned long))
+/** Element number for priv \a priv. */
+#define _PRIV_IDX(priv)         ((priv) / _PRIV_NBITS)
+/** Element bit for priv \a priv. */
+#define _PRIV_BIT(priv)         (1UL << ((priv) % _PRIV_NBITS))
+
+/** Operator privileges. */
+struct Privs {
+  unsigned long priv_mask[(PRIV_LAST_PRIV + _PRIV_NBITS - 1) / _PRIV_NBITS];
+};
+
 DECLARE_LIST(userList, struct userNode*);
 DECLARE_LIST(modeList, struct modeNode*);
 DECLARE_LIST(banList, struct banNode*);
@@ -142,9 +195,24 @@ struct userNode {
     // sethost - reed/apples
     char sethost[USERLEN + HOSTLEN + 2]; /* 1 for '\0' and 1 for @ = 2 */
 
+    /* GeoIP Data */
+    char *country_name;
+
+    /* GeoIP City Data */
+    char *country_code;
+    char *city;
+    char *region;
+    char *postal_code;
+    float latitude;
+    float longitude;
+    int dma_code;
+    int area_code;
+    
+
     time_t timestamp;             /* Time of last nick change */
     struct server *uplink;        /* Server that user is connected to */
     struct modeList channels;     /* Vector of channels user is in */
+    struct Privs   privs;
 
     /* from nickserv */
     struct handle_info *handle_info;
@@ -152,6 +220,21 @@ struct userNode {
     struct policer auth_policer;
 };
 
+#define privs(cli)             ((cli)->privs)
+#define PrivSet(pset, priv)     ((pset)->priv_mask[_PRIV_IDX(priv)] |= \
+                                 _PRIV_BIT(priv))
+#define PrivClr(pset, priv)     ((pset)->priv_mask[_PRIV_IDX(priv)] &= \
+                                 ~(_PRIV_BIT(priv)))
+#define PrivHas(pset, priv)     ((pset)->priv_mask[_PRIV_IDX(priv)] & \
+                                 _PRIV_BIT(priv))
+
+#define PRIV_ADD 1
+#define PRIV_DEL 0
+
+#define GrantPriv(cli, priv)    (PrivSet(&(privs(cli)), priv))
+#define RevokePriv(cli, priv)   (PrivClr(&(privs(cli)), priv))
+#define HasPriv(cli, priv)      (PrivHas(&(privs(cli)), priv))
+
 struct chanNode {
     chan_mode_t modes;
     unsigned int limit, locks;
@@ -286,6 +369,7 @@ void reg_account_func(account_func_t handler);
 void call_account_func(struct userNode *user, const char *stamp);
 void StampUser(struct userNode *user, const char *stamp, time_t timestamp);
 void assign_fakehost(struct userNode *user, const char *host, int announce);
+void set_geoip_info(struct userNode *user);
 
 typedef void (*new_channel_func_t) (struct chanNode *chan);
 void reg_new_channel_func(new_channel_func_t handler);