/*
- * charybdis: A useful ircd.
+ * Solanum: a slightly advanced ircd
* client.h: The ircd client header.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
#include "ircd.h"
#include "privilege.h"
-/* other structs */
-struct Blacklist;
-
/* we store ipv6 ips for remote clients, so this needs to be v6 always */
#define HOSTIPLEN 53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
#define PASSWDLEN 128
char *away; /* pointer to away message */
int refcnt; /* Number of times this block is referenced */
+ char *opername; /* name of operator{} block being used or tried (challenge) */
+ struct PrivilegeSet *privset;
+
char suser[NICKLEN+1];
};
*/
char *passwd;
char *auth_user;
- char *opername; /* name of operator{} block being used or tried (challenge) */
char *challenge;
char *fullcaps;
char *cipher_string;
uint16_t cork_count; /* used for corking/uncorking connections */
struct ev_entry *event; /* used for associated events */
- struct PrivilegeSet *privset; /* privset... */
-
char sasl_agent[IDLEN];
unsigned char sasl_out;
unsigned char sasl_complete;
(x)->handler = SERVER_HANDLER; }
#define SetClient(x) {(x)->status = STAT_CLIENT; \
- (x)->handler = IsOper((x)) ? \
+ (x)->handler = IsOperGeneral((x)) ? \
OPER_HANDLER : CLIENT_HANDLER; }
#define SetRemoteClient(x) {(x)->status = STAT_CLIENT; \
(x)->handler = RCLIENT_HANDLER; }
#define FLAGS_EXEMPTSPAMBOT 0x02000000
#define FLAGS_EXEMPTSHIDE 0x04000000
#define FLAGS_EXEMPTJUPE 0x08000000
+#define FLAGS_IDENTIFIED 0x10000000 /* owns their current nick */
/* flags for local clients, this needs stuff moved from above to here at some point */
#define LFLAGS_FLUSH 0x00000002
#define LFLAGS_CORK 0x00000004
#define LFLAGS_SCTP 0x00000008
+#define LFLAGS_SECURE 0x00000010 /* for marking SSL clients as secure before registration */
+/* LFLAGS_FAKE: client may not have the usually expected machinery plugged in; don't assert on it. For tests only. */
+#define LFLAGS_FAKE 0x00000020
/* umodes, settable flags */
/* lots of this moved to snomask -- jilles */
#define UMODE_WALLOP 0x0002 /* send wallops to them */
#define UMODE_OPERWALL 0x0004 /* Operwalls */
#define UMODE_INVISIBLE 0x0008 /* makes user invisible */
-#define UMODE_CALLERID 0x0010 /* block unless caller id's */
#define UMODE_LOCOPS 0x0020 /* show locops */
#define UMODE_SERVICE 0x0040
#define UMODE_DEAF 0x0080
#define UMODE_NOFORWARD 0x0100 /* don't forward */
-#define UMODE_REGONLYMSG 0x0200 /* only allow logged in users to msg */
/* 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 */
+#define UMODE_SECURE 0x4000 /* has a secure connection */
#define DEFAULT_OPER_UMODES (UMODE_SERVNOTICE | UMODE_OPERWALL | \
UMODE_WALLOP | UMODE_LOCOPS)
#define IsTGExcessive(x) ((x)->flags & FLAGS_TGEXCESSIVE)
#define SetTGExcessive(x) ((x)->flags |= FLAGS_TGEXCESSIVE)
#define ClearTGExcessive(x) ((x)->flags &= ~FLAGS_TGEXCESSIVE)
+#define IsIdentified(x) ((x)->flags & FLAGS_IDENTIFIED)
+#define SetIdentified(x) ((x)->flags |= FLAGS_IDENTIFIED)
+#define ClearIdentified(x) ((x)->flags &= ~FLAGS_IDENTIFIED)
/* local flags */
#define SetSCTP(x) ((x)->localClient->localflags |= LFLAGS_SCTP)
#define ClearSCTP(x) ((x)->localClient->localflags &= ~LFLAGS_SCTP)
+#define IsSecure(x) ((x)->localClient->localflags & LFLAGS_SECURE)
+#define SetSecure(x) ((x)->localClient->localflags |= LFLAGS_SECURE)
+#define ClearSecure(x) ((x)->localClient->localflags &= ~LFLAGS_SECURE)
+
/* oper flags */
#define MyOper(x) (MyConnect(x) && IsOper(x))
-#define SetOper(x) {(x)->umodes |= UMODE_OPER; \
- if (MyClient((x))) (x)->handler = OPER_HANDLER;}
-
-#define ClearOper(x) {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
- if (MyClient((x)) && !IsOper((x)) && !IsServer((x))) \
- (x)->handler = CLIENT_HANDLER; }
+#define SetOper(x) ((x)->umodes |= UMODE_OPER)
+#define ClearOper(x) ((x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN))
/* umode flags */
#define IsInvisible(x) ((x)->umodes & UMODE_INVISIBLE)
#define SetInvisible(x) ((x)->umodes |= UMODE_INVISIBLE)
#define ClearInvisible(x) ((x)->umodes &= ~UMODE_INVISIBLE)
-#define IsSSLClient(x) ((x)->umodes & UMODE_SSLCLIENT)
-#define SetSSLClient(x) ((x)->umodes |= UMODE_SSLCLIENT)
-#define ClearSSLClient(x) ((x)->umodes &= ~UMODE_SSLCLIENT)
+#define IsSecureClient(x) ((x)->umodes & UMODE_SECURE)
#define SendWallops(x) ((x)->umodes & UMODE_WALLOP)
#define SendLocops(x) ((x)->umodes & UMODE_LOCOPS)
#define SendServNotice(x) ((x)->umodes & UMODE_SERVNOTICE)
#define SendOperwall(x) ((x)->umodes & UMODE_OPERWALL)
-#define IsSetCallerId(x) ((x)->umodes & UMODE_CALLERID)
-#define IsService(x) ((x)->umodes & UMODE_SERVICE)
-#define IsDeaf(x) ((x)->umodes & UMODE_DEAF)
-#define IsNoForward(x) ((x)->umodes & UMODE_NOFORWARD)
-#define IsSetRegOnlyMsg(x) ((x)->umodes & UMODE_REGONLYMSG)
+#define IsService(x) ((x)->umodes & UMODE_SERVICE)
+#define IsDeaf(x) ((x)->umodes & UMODE_DEAF)
+#define IsNoForward(x) ((x)->umodes & UMODE_NOFORWARD)
#define SetGotId(x) ((x)->flags |= FLAGS_GOTID)
+#define ClearGotId(x) ((x)->flags &= ~FLAGS_GOTID)
#define IsGotId(x) (((x)->flags & FLAGS_GOTID) != 0)
#define IsExemptKline(x) ((x)->flags & FLAGS_EXEMPTKLINE)