/*
- * 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
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: client.h 3446 2007-05-14 22:21:16Z jilles $
*/
#ifndef INCLUDED_client_h
#define INCLUDED_client_h
-#include "config.h"
-
-#if !defined(CONFIG_RATBOX_LEVEL_1)
-#error Incorrect config.h for this revision of ircd.
-#endif
+#include "defaults.h"
#include "ircd_defs.h"
-#include "linebuf.h"
#include "channel.h"
-#include "res.h"
+#include "dns.h"
#include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
-#include "commio.h"
-
-/* other structs */
-struct Blacklist;
+#include "privilege.h"
/* 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
-#define CIPHERKEYLEN 64 /* 512bit */
-#define CLIENT_BUFSIZE 512 /* must be at least 512 bytes */
+#define PASSWDLEN 128
+#define CIPHERKEYLEN 64 /* 512bit */
#define IDLEN 10
+#define TGCHANGE_NUM 10 /* how many targets we keep track of */
+#define TGCHANGE_REPLY 5 /* how many reply targets */
+#define TGCHANGE_INITIAL 10 /* initial free targets (normal) */
+#define TGCHANGE_INITIAL_LOW 4 /* initial free targets (possible spambot) */
+
/*
* pre declare structs
*/
struct User;
struct Server;
struct LocalUser;
-struct AuthRequest;
struct PreClient;
struct ListClient;
+struct scache_entry;
+struct ws_ctl;
-/*
- * Atheme's coding standards require that we use BSD-style user-defined types
- * for stuff. Fun! --nenolod
- */
-typedef struct User user_t;
-typedef struct Server server_t;
-typedef struct Client client_t;
-typedef struct LocalUser local_user_t;
-typedef struct Listener listener_t;
-typedef struct DNSReply dns_reply_t;
-typedef struct Whowas whowas_entry_t;
-typedef struct ConfItem conf_item_t;
-typedef struct AuthRequest auth_request_t;
-typedef struct PreClient pre_client_t;
-typedef struct ListClient list_client_t;
+typedef int SSL_OPEN_CB(struct Client *, int status);
/*
* Client structures
*/
struct User
{
- dlink_list channel; /* chain of channel pointer blocks */
- dlink_list invited; /* chain of invite pointer blocks */
+ rb_dlink_list channel; /* chain of channel pointer blocks */
+ rb_dlink_list invited; /* chain of invite pointer blocks */
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];
};
struct Server
{
- user_t *user; /* who activated this connection */
- const char *up; /* Pointer to scache name */
- const char *upid;
+ struct User *user; /* who activated this connection */
char by[NICKLEN];
- dlink_list servers;
- dlink_list users;
+ rb_dlink_list servers;
+ rb_dlink_list users;
int caps; /* capabilities bit-field */
char *fullcaps;
-};
-
-struct SlinkRpl
-{
- int command;
- int datalen;
- int gotdatalen;
- int readdata;
- unsigned char *data;
+ struct scache_entry *nameinfo;
};
struct ZipStats
{
- unsigned long in;
- unsigned long in_wire;
- unsigned long out;
- unsigned long out_wire;
- unsigned long inK;
- unsigned long inK_wire;
- unsigned long outK;
- unsigned long outK_wire;
+ unsigned long long in;
+ unsigned long long in_wire;
+ unsigned long long out;
+ unsigned long long out_wire;
double in_ratio;
double out_ratio;
};
struct Client
{
- dlink_node node;
- dlink_node lnode;
- user_t *user; /* ...defined, if this is a User */
- server_t *serv; /* ...defined, if this is a server */
- client_t *servptr; /* Points to server this Client is on */
- client_t *from; /* == self, if Local Client, *NEVER* NULL! */
-
- whowas_entry_t *whowas; /* Pointers to whowas structs */
+ rb_dlink_node node;
+ rb_dlink_node lnode;
+ struct User *user; /* ...defined, if this is a User */
+ struct Server *serv; /* ...defined, if this is a server */
+ struct Client *servptr; /* Points to server this Client is on */
+ struct Client *from; /* == self, if Local Client, *NEVER* NULL! */
+
+ rb_dlink_list whowas_clist;
+
time_t tsinfo; /* TS on the nick, SVINFO on server */
unsigned int umodes; /* opers, normal users subset */
- unsigned int flags; /* client flags */
- unsigned int flags2; /* ugh. overflow */
+ uint64_t flags; /* client flags */
unsigned int snomask; /* server notice mask */
unsigned long serial; /* used to enforce 1 send per nick */
/* client->name is the unique name for a client nick or host */
- char name[HOSTLEN + 1];
+ char name[NAMELEN + 1];
- /*
- * client->username is the username from ident or the USER message,
- * If the client is idented the USER message is ignored, otherwise
- * the username part of the USER message is put here prefixed with a
+ /*
+ * client->username is the username from ident or the USER message,
+ * If the client is idented the USER message is ignored, otherwise
+ * the username part of the USER message is put here prefixed with a
* tilde depending on the I:line, Once a client has registered, this
* field should be considered read-only.
*/
/* list of who has this client on their allow list, its counterpart
* is in LocalUser
*/
- dlink_list on_allow_list;
+ rb_dlink_list on_allow_list;
+
+ time_t first_received_message_time;
+ int received_number_of_privmsgs;
+ int flood_noticed;
+
+ struct LocalUser *localClient;
+ struct PreClient *preClient;
- local_user_t *localClient;
- pre_client_t *preClient;
+ time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
+ char *certfp; /* client certificate fingerprint */
};
struct LocalUser
{
- dlink_node tnode; /* This is the node for the local list type the client is on*/
+ rb_dlink_node tnode; /* This is the node for the local list type the client is on */
+ rb_dlink_list connids; /* This is the list of connids to free */
+
/*
* The following fields are allocated only for local clients
* (directly connected to *this* server with a socket.
*/
/* Anti flooding part, all because of lamers... */
- time_t last_join_time; /* when this client last
+ time_t last_join_time; /* when this client last
joined a channel */
- time_t last_leave_time; /* when this client last
+ time_t last_leave_time; /* when this client last
* left a channel */
- int join_leave_count; /* count of JOIN/LEAVE in less than
+ int join_leave_count; /* count of JOIN/LEAVE in less than
MIN_JOIN_LEAVE_TIME seconds */
- int oper_warn_count_down; /* warn opers of this possible
+ int oper_warn_count_down; /* warn opers of this possible
spambot every time this gets to 0 */
time_t last_caller_id_time;
- time_t first_received_message_time;
- int received_number_of_privmsgs;
- int flood_noticed;
time_t lasttime; /* last time we parsed something */
time_t firsttime; /* time client was created */
/* Send and receive linebuf queues .. */
buf_head_t buf_sendq;
buf_head_t buf_recvq;
+
/*
* we want to use unsigned int here so the sizes have a better chance of
* staying the same on 64 bit machines. The current trend is to use
* I32LP64, (32 bit ints, 64 bit longs and pointers) and since ircd
- * will NEVER run on an operating system where ints are less than 32 bits,
+ * will NEVER run on an operating system where ints are less than 32 bits,
* it's a relatively safe bet to use ints. Since right shift operations are
- * performed on these, it's not safe to allow them to become negative,
- * which is possible for long running server connections. Unsigned values
+ * performed on these, it's not safe to allow them to become negative,
+ * which is possible for long running server connections. Unsigned values
* generally overflow gracefully. --Bleep
+ *
+ * We have modern conveniences. Let's use uint32_t. --Elizafox
*/
- unsigned int sendM; /* Statistics: protocol messages send */
- unsigned int sendK; /* Statistics: total k-bytes send */
- unsigned int receiveM; /* Statistics: protocol messages received */
- unsigned int receiveK; /* Statistics: total k-bytes received */
- unsigned short sendB; /* counters to count upto 1-k lots of bytes */
- unsigned short receiveB; /* sent and received. */
- listener_t *listener; /* listener accepted from */
- conf_item_t *att_conf; /* attached conf */
+ uint32_t sendM; /* Statistics: protocol messages send */
+ uint32_t sendK; /* Statistics: total k-bytes send */
+ uint32_t receiveM; /* Statistics: protocol messages received */
+ uint32_t receiveK; /* Statistics: total k-bytes received */
+ uint16_t sendB; /* counters to count upto 1-k lots of bytes */
+ uint16_t receiveB; /* sent and received. */
+ struct Listener *listener; /* listener accepted from */
+ struct ConfItem *att_conf; /* attached conf */
struct server_conf *att_sconf;
- struct irc_sockaddr_storage ip;
+ struct rb_sockaddr_storage ip;
time_t last_nick_change;
int number_of_nick_changes;
* agreed. lets get rid of it someday! --nenolod
*/
char *passwd;
- char *opername; /* name of operator{} block being used or tried (challenge) */
+ char *auth_user;
char *challenge;
char *fullcaps;
+ char *cipher_string;
int caps; /* capabilities bit-field */
- int fd; /* >= 0, for local clients */
+ rb_fde_t *F; /* >= 0, for local clients */
/* time challenge response is valid for */
time_t chal_time;
- int ctrlfd; /* For servers:
- control fd used for sending commands
- to servlink */
-
- struct SlinkRpl slinkrpl; /* slink reply being parsed */
- unsigned char *slinkq; /* sendq for control data */
- int slinkq_ofs; /* ofset into slinkq */
- int slinkq_len; /* length remaining after slinkq_ofs */
-
- struct ZipStats zipstats;
-
- time_t last_away; /* Away since... */
+ time_t next_away; /* Don't allow next away before... */
time_t last;
/* clients allowed to talk through +g */
- dlink_list allow_list;
+ rb_dlink_list allow_list;
/* nicknames theyre monitoring */
- dlink_list monitor_list;
+ rb_dlink_list monitor_list;
/*
* Anti-flood stuff. We track how many messages were parsed and how
* to avoid flooding.
* -- adrian
*/
- int allow_read; /* how many we're allowed to read in this second */
- int actually_read; /* how many we've actually read in this second */
int sent_parsed; /* how many messages we've parsed in this second */
time_t last_knock; /* time of last knock */
- unsigned long random_ping;
- auth_request_t *auth_request;
+ uint32_t random_ping;
/* target change stuff */
- void *targets[10]; /* targets were aware of */
- unsigned int targinfo[2]; /* cyclic array, no in use */
+ /* targets we're aware of (fnv32(use_id(target_p))):
+ * 0..TGCHANGE_NUM-1 regular slots
+ * TGCHANGE_NUM..TGCHANGE_NUM+TGCHANGE_REPLY-1 reply slots
+ */
+ uint32_t targets[TGCHANGE_NUM + TGCHANGE_REPLY];
+ unsigned int targets_free; /* free targets */
time_t target_last; /* last time we cleared a slot */
- list_client_t *safelist_data;
+ /* ratelimit items */
+ time_t ratelimit;
+ unsigned int join_who_credits;
+
+ struct ListClient *safelist_data;
char *mangledhost; /* non-NULL if host mangling module loaded and
applicable to this client */
+
+ struct _ssl_ctl *ssl_ctl; /* which ssl daemon we're associate with */
+ struct _ssl_ctl *z_ctl; /* second ctl for ssl+zlib */
+ struct ws_ctl *ws_ctl; /* ctl for wsockd */
+ SSL_OPEN_CB *ssl_callback; /* ssl connection is now open */
+ uint32_t localflags;
+ struct ZipStats *zipstats; /* zipstats */
+ uint16_t cork_count; /* used for corking/uncorking connections */
+ struct ev_entry *event; /* used for associated events */
+
+ char sasl_agent[IDLEN];
+ unsigned char sasl_out;
+ unsigned char sasl_complete;
+
+ unsigned int sasl_messages;
+ unsigned int sasl_failures;
+ time_t sasl_next_retry;
+};
+
+#define AUTHC_F_DEFERRED 0x01
+#define AUTHC_F_COMPLETE 0x02
+
+struct AuthClient
+{
+ uint32_t cid; /* authd id */
+ time_t timeout; /* When to terminate authd query */
+ bool accepted; /* did authd accept us? */
+ char cause; /* rejection cause */
+ char *data; /* reason data */
+ char *reason; /* reason we were rejected */
+ int flags;
};
struct PreClient
char spoofuser[USERLEN + 1];
char spoofhost[HOSTLEN + 1];
- char sasl_agent[IDLEN];
- unsigned char sasl_out;
- unsigned char sasl_complete;
+ struct AuthClient auth;
- dlink_list dnsbl_queries; /* list of struct BlacklistClient * */
- struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */
+ struct rb_sockaddr_storage lip; /* address of our side of the connection */
+
+ char id[IDLEN]; /* UID/SID, unique on the network (unverified) */
};
struct ListClient
{
- unsigned int hash_indice;
+ char *chname;
unsigned int users_min, users_max;
-
- /* It would be nice to add other modifiers,
- * but not for 1.1 --nenolod
- */
-};
-
-struct exit_client_hook
-{
- struct Client *client_p;
- char exit_message[TOPICLEN];
+ time_t created_min, created_max, topic_min, topic_max;
+ int operspy;
};
/*
(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; }
* ts stuff
*/
#define TS_CURRENT 6
-
-#ifdef TS6_ONLY
#define TS_MIN 6
-#else
-#define TS_MIN 3
-#endif
#define TS_DOESTS 0x10000000
#define DoesTS(x) ((x)->tsinfo & TS_DOESTS)
/* housekeeping flags */
-#define FLAGS_PINGSENT 0x0001 /* Unreplied ping sent */
-#define FLAGS_DEAD 0x0002 /* Local socket is dead--Exiting soon */
-#define FLAGS_KILLED 0x0004 /* Prevents "QUIT" from being sent for this */
-#define FLAGS_SENTUSER 0x0008 /* Client sent a USER command. */
-#define FLAGS_CLOSING 0x0020 /* set when closing to suppress errors */
-#define FLAGS_CHKACCESS 0x0040 /* ok to check clients access if set */
-#define FLAGS_GOTID 0x0080 /* successful ident lookup achieved */
-#define FLAGS_NEEDID 0x0100 /* I-lines say must use ident return */
-#define FLAGS_NORMALEX 0x0400 /* Client exited normally */
-#define FLAGS_SENDQEX 0x0800 /* Sendq exceeded */
-#define FLAGS_SERVLINK 0x10000 /* servlink has servlink process */
-#define FLAGS_MARK 0x20000 /* marked client */
-#define FLAGS_HIDDEN 0x40000 /* hidden server */
-#define FLAGS_EOB 0x80000 /* EOB */
-#define FLAGS_MYCONNECT 0x100000 /* MyConnect */
-#define FLAGS_IOERROR 0x200000 /* IO error */
-#define FLAGS_SERVICE 0x400000 /* network service */
-#define FLAGS_TGCHANGE 0x800000 /* we're allowed to clear something */
-#define FLAGS_DYNSPOOF 0x1000000 /* dynamic spoof, only opers see ip */
-#define FLAGS_EXUNKNOWN 0x2000000 /* too many unknowns exit.. */
+#define FLAGS_PINGSENT 0x00000001 /* Unreplied ping sent */
+#define FLAGS_DEAD 0x00000002 /* Local socket is dead--Exiting soon */
+#define FLAGS_KILLED 0x00000004 /* Prevents "QUIT" from being sent for this */
+#define FLAGS_SENTUSER 0x00000008 /* Client sent a USER command. */
+#define FLAGS_CLICAP 0x00000010 /* In CAP negotiation, wait for CAP END */
+#define FLAGS_CLOSING 0x00000020 /* set when closing to suppress errors */
+#define FLAGS_PING_COOKIE 0x00000040 /* has sent ping cookie */
+#define FLAGS_GOTID 0x00000080 /* successful ident lookup achieved */
+#define FLAGS_FLOODDONE 0x00000100 /* flood grace period over / reported */
+#define FLAGS_NORMALEX 0x00000200 /* Client exited normally */
+#define FLAGS_MARK 0x00000400 /* marked client */
+#define FLAGS_HIDDEN 0x00000800 /* hidden server */
+#define FLAGS_EOB 0x00001000 /* EOB */
+#define FLAGS_MYCONNECT 0x00002000 /* MyConnect */
+#define FLAGS_IOERROR 0x00004000 /* IO error */
+#define FLAGS_SERVICE 0x00008000 /* network service */
+#define FLAGS_TGCHANGE 0x00010000 /* we're allowed to clear something */
+#define FLAGS_DYNSPOOF 0x00020000 /* dynamic spoof, only opers see ip */
+#define FLAGS_TGEXCESSIVE 0x00040000 /* whether the client has attemped to change targets excessively fast */
+#define FLAGS_CLICAP_DATA 0x00080000 /* requested CAP LS 302 */
+#define FLAGS_EXTENDCHANS 0x00100000
+#define FLAGS_EXEMPTRESV 0x00200000
+#define FLAGS_EXEMPTKLINE 0x00400000
+#define FLAGS_EXEMPTFLOOD 0x00800000
+#define FLAGS_IP_SPOOFING 0x01000000
+#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_SSL 0x00000001
+#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_SERVNOTICE 0x0001 /* server notices */
-#define UMODE_WALLOP 0x0100 /* send wallops to them */
-#define UMODE_OPERWALL 0x0200 /* Operwalls */
-#define UMODE_INVISIBLE 0x0400 /* makes user invisible */
-#define UMODE_CALLERID 0x2000 /* block unless caller id's */
-#define UMODE_LOCOPS 0x8000 /* show locops */
-#define UMODE_SERVICE 0x40000
-#define UMODE_DEAF 0x80000
-#define UMODE_NOFORWARD 0x400000 /* don't forward */
-#define UMODE_REGONLYMSG 0x800000 /* only allow logged in users to msg */
+#define UMODE_WALLOP 0x0002 /* send wallops to them */
+#define UMODE_OPERWALL 0x0004 /* Operwalls */
+#define UMODE_INVISIBLE 0x0008 /* makes user invisible */
+#define UMODE_LOCOPS 0x0020 /* show locops */
+#define UMODE_SERVICE 0x0040
+#define UMODE_DEAF 0x0080
+#define UMODE_NOFORWARD 0x0100 /* don't forward */
/* user information flags, only settable by remote mode or local oper */
-#define UMODE_OPER 0x100000 /* Operator */
-#define UMODE_ADMIN 0x200000 /* Admin on server */
-
-#define UMODE_ALL UMODE_SERVNOTICE
-
-/* overflow flags */
-/* EARLIER FLAGS ARE IN s_newconf.h */
-#define FLAGS2_EXEMPTRESV 0x0080000
-#define FLAGS2_EXEMPTGLINE 0x0100000
-#define FLAGS2_EXEMPTKLINE 0x0200000
-#define FLAGS2_EXEMPTFLOOD 0x0400000
-#define FLAGS2_NOLIMIT 0x0800000
-#define FLAGS2_IDLE_LINED 0x1000000
-#define FLAGS2_CLICAP 0x2000000
-#define FLAGS2_PING_COOKIE 0x4000000
-#define FLAGS2_IP_SPOOFING 0x8000000
-#define FLAGS2_FLOODDONE 0x10000000
-#define FLAGS2_EXEMPTSPAMBOT 0x20000000
-#define FLAGS2_EXEMPTSHIDE 0x40000000
-#define FLAGS2_EXEMPTJUPE 0x80000000
+#define UMODE_OPER 0x1000 /* Operator */
+#define UMODE_ADMIN 0x2000 /* Admin on server */
+#define UMODE_SECURE 0x4000 /* has a secure connection */
#define DEFAULT_OPER_UMODES (UMODE_SERVNOTICE | UMODE_OPERWALL | \
UMODE_WALLOP | UMODE_LOCOPS)
#define DEFAULT_OPER_SNOMASK SNO_GENERAL
-#define FLAGS_ID (FLAGS_NEEDID | FLAGS_GOTID)
-
-#define CLICAP_MULTI_PREFIX 0x0001
-#define CLICAP_SASL 0x0002
-
/*
* flags macros.
*/
#define IsPerson(x) (IsClient(x) && (x)->user != NULL)
-#define DoAccess(x) ((x)->flags & FLAGS_CHKACCESS)
-#define SetAccess(x) ((x)->flags |= FLAGS_CHKACCESS)
-#define ClearAccess(x) ((x)->flags &= ~FLAGS_CHKACCESS)
#define HasServlink(x) ((x)->flags & FLAGS_SERVLINK)
#define SetServlink(x) ((x)->flags |= FLAGS_SERVLINK)
#define MyConnect(x) ((x)->flags & FLAGS_MYCONNECT)
#define IsDynSpoof(x) ((x)->flags & FLAGS_DYNSPOOF)
#define SetDynSpoof(x) ((x)->flags |= FLAGS_DYNSPOOF)
#define ClearDynSpoof(x) ((x)->flags &= ~FLAGS_DYNSPOOF)
-#define IsExUnknown(x) ((x)->flags & FLAGS_EXUNKNOWN)
-#define SetExUnknown(x) ((x)->flags |= FLAGS_EXUNKNOWN)
+#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)
-/* oper flags */
-#define MyOper(x) (MyConnect(x) && IsOper(x))
+/* local flags */
-#define SetOper(x) {(x)->umodes |= UMODE_OPER; \
- if (MyClient((x))) (x)->handler = OPER_HANDLER;}
+#define IsSSL(x) ((x)->localClient->localflags & LFLAGS_SSL)
+#define SetSSL(x) ((x)->localClient->localflags |= LFLAGS_SSL)
+#define ClearSSL(x) ((x)->localClient->localflags &= ~LFLAGS_SSL)
-#define ClearOper(x) {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
- if (MyClient((x)) && !IsOper((x)) && !IsServer((x))) \
- (x)->handler = CLIENT_HANDLER; }
+#define IsFlush(x) ((x)->localClient->localflags & LFLAGS_FLUSH)
+#define SetFlush(x) ((x)->localClient->localflags |= LFLAGS_FLUSH)
+#define ClearFlush(x) ((x)->localClient->localflags &= ~LFLAGS_FLUSH)
-#define IsPrivileged(x) (IsOper(x) || IsServer(x))
+#define IsSCTP(x) ((x)->localClient->localflags & LFLAGS_SCTP)
+#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)
+#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 IsSecureClient(x) ((x)->umodes & UMODE_SECURE)
#define SendWallops(x) ((x)->umodes & UMODE_WALLOP)
-#define ClearWallops(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 SetWallops(x) ((x)->umodes |= UMODE_WALLOP)
-#define SetCallerId(x) ((x)->umodes |= UMODE_CALLERID)
-#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 SetNeedId(x) ((x)->flags |= FLAGS_NEEDID)
-#define IsNeedId(x) (((x)->flags & FLAGS_NEEDID) != 0)
+#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)
-/*
- * flags2 macros.
- */
-#define IsExemptKline(x) ((x)->flags2 & FLAGS2_EXEMPTKLINE)
-#define SetExemptKline(x) ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptLimits(x) ((x)->flags2 & FLAGS2_NOLIMIT)
-#define SetExemptLimits(x) ((x)->flags2 |= FLAGS2_NOLIMIT)
-#define IsExemptGline(x) ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x) ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
-#define IsExemptFlood(x) ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
-#define SetExemptFlood(x) ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
-#define IsExemptSpambot(x) ((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
-#define SetExemptSpambot(x) ((x)->flags2 |= FLAGS2_EXEMPTSPAMBOT)
-#define IsExemptShide(x) ((x)->flags2 & FLAGS2_EXEMPTSHIDE)
-#define SetExemptShide(x) ((x)->flags2 |= FLAGS2_EXEMPTSHIDE)
-#define IsExemptJupe(x) ((x)->flags2 & FLAGS2_EXEMPTJUPE)
-#define SetExemptJupe(x) ((x)->flags2 |= FLAGS2_EXEMPTJUPE)
-#define IsExemptResv(x) ((x)->flags2 & FLAGS2_EXEMPTRESV)
-#define SetExemptResv(x) ((x)->flags2 |= FLAGS2_EXEMPTRESV)
-#define IsIPSpoof(x) ((x)->flags2 & FLAGS2_IP_SPOOFING)
-#define SetIPSpoof(x) ((x)->flags2 |= FLAGS2_IP_SPOOFING)
-
-#define SetIdlelined(x) ((x)->flags2 |= FLAGS2_IDLE_LINED)
-#define IsIdlelined(x) ((x)->flags2 & FLAGS2_IDLE_LINED)
+#define IsExemptKline(x) ((x)->flags & FLAGS_EXEMPTKLINE)
+#define SetExemptKline(x) ((x)->flags |= FLAGS_EXEMPTKLINE)
+#define IsExemptFlood(x) ((x)->flags & FLAGS_EXEMPTFLOOD)
+#define SetExemptFlood(x) ((x)->flags |= FLAGS_EXEMPTFLOOD)
+#define IsExemptSpambot(x) ((x)->flags & FLAGS_EXEMPTSPAMBOT)
+#define SetExemptSpambot(x) ((x)->flags |= FLAGS_EXEMPTSPAMBOT)
+#define IsExemptShide(x) ((x)->flags & FLAGS_EXEMPTSHIDE)
+#define SetExemptShide(x) ((x)->flags |= FLAGS_EXEMPTSHIDE)
+#define IsExemptJupe(x) ((x)->flags & FLAGS_EXEMPTJUPE)
+#define SetExemptJupe(x) ((x)->flags |= FLAGS_EXEMPTJUPE)
+#define IsExemptResv(x) ((x)->flags & FLAGS_EXEMPTRESV)
+#define SetExemptResv(x) ((x)->flags |= FLAGS_EXEMPTRESV)
+#define IsIPSpoof(x) ((x)->flags & FLAGS_IP_SPOOFING)
+#define SetIPSpoof(x) ((x)->flags |= FLAGS_IP_SPOOFING)
+#define IsExtendChans(x) ((x)->flags & FLAGS_EXTENDCHANS)
+#define SetExtendChans(x) ((x)->flags |= FLAGS_EXTENDCHANS)
/* for local users: flood grace period is over
* for servers: mentioned in networknotice.c notice
*/
-#define IsFloodDone(x) ((x)->flags2 & FLAGS2_FLOODDONE)
-#define SetFloodDone(x) ((x)->flags2 |= FLAGS2_FLOODDONE)
+#define IsFloodDone(x) ((x)->flags & FLAGS_FLOODDONE)
+#define SetFloodDone(x) ((x)->flags |= FLAGS_FLOODDONE)
+
+/* These also operate on the uplink from which it came */
+#define IsCork(x) (MyConnect(x) ? (x)->localClient->cork_count : (x)->from->localClient->cork_count)
+#define SetCork(x) (MyConnect(x) ? (x)->localClient->cork_count++ : (x)->from->localClient->cork_count++ )
+#define ClearCork(x) (MyConnect(x) ? (x)->localClient->cork_count-- : (x)->from->localClient->cork_count--)
/*
* definitions for get_client_name
#define SHOW_IP 1
#define MASK_IP 2
+enum
+{
+ D_LINED,
+ K_LINED
+};
+
extern void check_banned_lines(void);
-extern void check_klines_event(void *unused);
extern void check_klines(void);
-extern void check_glines(void);
+extern void check_one_kline(struct ConfItem *kline);
extern void check_dlines(void);
extern void check_xlines(void);
+extern void resv_nick_fnc(const char *mask, const char *reason, int temp_time);
extern const char *get_client_name(struct Client *client, int show_ip);
-extern const char *get_server_name(struct Client *client, int show_ip);
extern const char *log_client_name(struct Client *, int);
extern int is_remote_connect(struct Client *);
extern void init_client(void);
-extern client_t *make_client(struct Client *from);
+extern struct Client *make_client(struct Client *from);
extern void free_pre_client(struct Client *client);
-extern void free_client(struct Client *client);
+extern void notify_banned_client(struct Client *, struct ConfItem *, int ban);
extern int exit_client(struct Client *, struct Client *, struct Client *, const char *);
extern void error_exit_client(struct Client *, int);
-
-
extern void count_local_client_memory(size_t * count, size_t * memory);
extern void count_remote_client_memory(size_t * count, size_t * memory);
-extern client_t *find_chasing(struct Client *, const char *, int *);
-extern client_t *find_person(const char *);
-extern client_t *find_named_person(const char *);
-extern client_t *next_client(struct Client *, const char *);
+extern int clean_nick(const char *, int loc_client);
+
+extern struct Client *find_chasing(struct Client *, const char *, int *);
+extern struct Client *find_person(const char *);
+extern struct Client *find_named_person(const char *);
+extern struct Client *next_client(struct Client *, const char *);
-#define accept_message(s, t) ((s) == (t) || (dlinkFind((s), &((t)->localClient->allow_list))))
+#define accept_message(s, t) ((s) == (t) || (rb_dlinkFind((s), &((t)->localClient->allow_list))))
extern void del_all_accepts(struct Client *client_p);
-extern void dead_link(struct Client *client_p);
+extern void dead_link(struct Client *client_p, int sendqex);
extern int show_ip(struct Client *source_p, struct Client *target_p);
-extern int show_ip_conf(struct ConfItem *aconf, struct Client *target_p);
+extern int show_ip_conf(struct ConfItem *aconf, struct Client *source_p);
+extern int show_ip_whowas(struct Whowas *whowas, struct Client *source_p);
-extern void initUser(void);
extern void free_user(struct User *, struct Client *);
-extern user_t *make_user(struct Client *);
-extern server_t *make_server(struct Client *);
+extern struct User *make_user(struct Client *);
+extern struct Server *make_server(struct Client *);
extern void close_connection(struct Client *);
extern void init_uid(void);
extern char *generate_uid(void);
+void allocate_away(struct Client *);
+void free_away(struct Client *);
+
+uint32_t connid_get(struct Client *client_p);
+void connid_put(uint32_t id);
+void client_release_connids(struct Client *client_p);
+
#endif /* INCLUDED_client_h */