X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/ea4041ece9ba9869c20f9a37aa2d89aa5e1dd11b..1a9821cd5104596cac3cce5669f62bb8cb8c4691:/include/client.h

diff --git a/include/client.h b/include/client.h
index e1f285a..c74af9d 100644
--- a/include/client.h
+++ b/include/client.h
@@ -281,8 +281,6 @@ struct LocalUser
 	struct ev_entry *event;			/* used for associated events */
 
 	struct PrivilegeSet *privset;		/* privset... */
-
-	struct rb_event_t *override_timeout_event;
 };
 
 struct PreClient
@@ -426,20 +424,13 @@ struct ListClient
 #define UMODE_NOCTCP	   0x0400	/* block CTCPs except for ACTION */
 #define UMODE_NOINVITE	   0x0800	/* block invites */
 #define UMODE_BOT	   0x8000	/* mark as a bot in whois */
+#define UMODE_SCALLERID    0x40000	/* soft caller id */
 
 /* user information flags, only settable by remote mode or local oper */
 #define UMODE_OPER         0x1000	/* Operator */
 #define UMODE_ADMIN        0x2000	/* Admin on server */
 #define UMODE_SSLCLIENT    0x4000	/* using SSL */
-
-/* oper-controlled privledge umodes. */
-#define UMODE_OVERRIDE		0x20000
-
-/* umode/oper mode macros */
-#define IsOper(x)      ((x)->umodes & UMODE_OPER)
-#define IsAdmin(x)     ((x)->umodes & UMODE_ADMIN)
-#define IsHelper(x)        ((x)->umodes & UMODE_HELPER)
-#define IsAnyOper(x)       ((x)->umodes & (UMODE_OPER|UMODE_HELPER))
+#define UMODE_OVERRIDE     0x20000  /* able to override */
 
 #define IsOverride(x)      ((x)->umodes & UMODE_OVERRIDE)
 
@@ -533,6 +524,7 @@ struct ListClient
 #define IsSetNoCTCP(x)		((x)->umodes & UMODE_NOCTCP)
 #define IsSetNoInvite(x)	((x)->umodes & UMODE_NOINVITE)
 #define IsSetBot(x)		((x)->umodes & UMODE_BOT)
+#define IsSetSCallerId(x)	((x)->umodes & UMODE_SCALLERID)
 
 #define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
 #define IsGotId(x)              (((x)->flags & FLAGS_GOTID) != 0)