X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/cf8bedffe23391f3c9784f46e938113abdbc1c6a..3b7fa78b1de8f9ee8718cba3da3b2db522b70620:/src/hash.h

diff --git a/src/hash.h b/src/hash.h
index b82f682..2c619a0 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -53,13 +53,14 @@
 #define MODE_HIDEMODE		0x02000000 /* +L hide modes */
 #define MODE_APASS		0x04000000 /* +A adminpass */
 #define MODE_UPASS		0x08000000 /* +U userpass */
+#define MODE_ADMINSONLY         0x10000000 /* +a Admins only */
 #define MODE_REMOVE             0x80000000
 
 #define FLAGS_OPER		0x000001 /* Operator +O */
 #define FLAGS_LOCOP		0x000002 /* Local operator +o */
 #define FLAGS_INVISIBLE		0x000004 /* invisible +i */
 #define FLAGS_WALLOP		0x000008 /* receives wallops +w */
-#define FLAGS_SERVNOTICE	0x000010 /* receives server notices +s */
+#define FLAGS_DUMMY             0x000010 /* user is not announced to other servers */
 #define FLAGS_DEAF		0x000020 /* deaf +d */
 #define FLAGS_SERVICE		0x000040 /* cannot be kicked, killed or deoped +k */
 #define FLAGS_GLOBAL		0x000080 /* receives global messages +g */
@@ -84,7 +85,6 @@
 #define IsInvisible(x)          ((x)->modes & FLAGS_INVISIBLE)
 #define IsGlobal(x)             ((x)->modes & FLAGS_GLOBAL)
 #define IsWallOp(x)             ((x)->modes & FLAGS_WALLOP)
-#define IsServNotice(x)         ((x)->modes & FLAGS_SERVNOTICE)
 #define IsBotM(x)      		((x)->modes & FLAGS_BOT)
 #define IsHideChans(x)   	((x)->modes & FLAGS_HIDECHANS)
 #define IsHideIdle(x)      	((x)->modes & FLAGS_HIDEIDLE)
@@ -97,6 +97,7 @@
 #define IsHiddenHost(x)         ((x)->modes & FLAGS_HIDDEN_HOST)
 #define IsReggedNick(x)         ((x)->modes & FLAGS_REGNICK)
 #define IsRegistering(x)	((x)->modes & FLAGS_REGISTERING)
+#define IsDummy(x)              ((x)->modes & FLAGS_DUMMY)
 #define IsFakeHost(x)           ((x)->fakehost[0] != '\0')
 #define IsLocal(x)              ((x)->uplink == self)
 
@@ -133,6 +134,8 @@ enum Priv {
   PRIV_REMOTEREHASH,    /**< oper can remote REHASH */
   PRIV_RESTART,         /**< oper can RESTART */
   PRIV_DIE,             /**< oper can DIE */
+  PRIV_ZLINE,           /**< oper can ZLINE */
+  PRIV_LOCAL_ZLINE,     /**< oper can local ZLINE */
   PRIV_GLINE,           /**< oper can GLINE */
   PRIV_LOCAL_GLINE,     /**< oper can local GLINE */
   PRIV_SHUN,            /**< oper can SHUN */
@@ -150,12 +153,17 @@ enum Priv {
   PRIV_DISPLAY,         /**< "Is an oper" displayed */
   PRIV_SEE_OPERS,       /**< display hidden opers */
   PRIV_WIDE_GLINE,      /**< oper can set wider G-lines */
+  PRIV_WIDE_ZLINE,      /**< oper can set wider Z-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_WHOIS_NOTICE,    /**< oper can set/unset user mode +W */
+  PRIV_HIDE_IDLE,       /**< oper can set/unset user mode +I */
+  PRIV_XTRAOP,          /**< oper can set/unset user mode +X */
+  PRIV_HIDE_CHANNELS,   /**< oper can set/unset user mode +n */
   PRIV_LAST_PRIV        /**< number of privileges */
 };
 
@@ -216,6 +224,7 @@ struct userNode {
     char *version_reply;          /* only filled in if a version query was triggered */
 
     time_t timestamp;             /* Time of last nick change */
+    time_t idle_since;
     struct server *uplink;        /* Server that user is connected to */
     struct modeList channels;     /* Vector of channels user is in */
     struct Privs   privs;
@@ -291,7 +300,7 @@ struct modeNode {
 struct server {
     char name[SERVERNAMEMAX+1];
     time_t boot;
-    time_t link;
+    time_t link_time;
     char description[SERVERDESCRIPTMAX+1];
 #ifdef WITH_PROTOCOL_P10
     char numeric[COMBO_NUMERIC_LEN+1];
@@ -356,8 +365,10 @@ struct server* GetServerH(const char *name); /* using full name */
 struct userNode* GetUserH(const char *nick);   /* using nick */
 struct chanNode* GetChannel(const char *name);
 struct modeNode* GetUserMode(struct chanNode* channel, struct userNode* user);
+int userList_contains(struct userList *list, struct userNode *user);
+unsigned int IsUserP(struct userNode *user);
 
-typedef void (*server_link_func_t) (struct server *server);
+typedef int (*server_link_func_t) (struct server *server);
 void reg_server_link_func(server_link_func_t handler);
 
 typedef int (*new_user_func_t) (struct userNode *user);