ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/client.h

Comparing:
ircd-hybrid-7.2/include/client.h (file contents), Revision 317 by michael, Sat Dec 24 14:45:17 2005 UTC vs.
ircd-hybrid-8/include/client.h (file contents), Revision 1302 by michael, Wed Mar 21 17:48:54 2012 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	–	*  client.h: The ircd client header.
3		*
4		*  Copyright (C) 2002 by the past and present ircd coders, and others.
5		*
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file client.h
23	+	* \brief Header including structures, macros and prototypes for client handling
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		#ifndef INCLUDED_client_h
29		#define INCLUDED_client_h
30
31	+	#include "list.h"
32		#include "fdlist.h"
33	<	#include "setup.h"
33	>	#include "config.h"
34		#include "ircd_defs.h"
31	–	#include "ircd_handler.h"
35		#include "dbuf.h"
36		#include "channel.h"
37		#include "irc_res.h"
38
39	<	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
39	>	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
40		#define PASSWDLEN       20
41		#define CIPHERKEYLEN    64 /* 512bit */
42		#define IDLEN           12 /* this is the maximum length, not the actual
#	Line 44 | Line 47
47		*/
48		struct AccessItem;
49		struct Whowas;
47	–	struct DNSReply;
50		struct Listener;
51		struct Client;
52		struct LocalUser;
53
52	–	/*
53	–	* Client structures
54	–	*/
54
55	+	/*! \brief Server structure */
56		struct Server
57		{
58	<	char by[NICKLEN];       /* who activated this connection     */
59	<	struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
60	<	dlink_list servers;     /* Servers on this server            */
61	<	dlink_list users;       /* Users on this server              */
62	<	int dep_servers;        /* Total number of dependent servers on all levels */
63	<	int dep_users;          /* Total number of dependent users on all levels */
64	<	};
65	<
66	<	struct SlinkRpl
67	<	{
68	<	int command;
69	<	int datalen;
70	<	int gotdatalen;
71	<	int readdata;
72	<	unsigned char *data;
73	<	};
74	<
75	<	struct ZipStats
76	<	{
77	<	unsigned long in;
78	<	unsigned long in_wire;
79	<	unsigned long out;
80	<	unsigned long out_wire;
81	<	double in_ratio;
82	<	double out_ratio;
58	>	struct ConfItem *sconf; /**< ConfItem connect{} pointer for this server */
59	>	dlink_list server_list; /**< Servers on this server */
60	>	dlink_list client_list; /**< Clients on this server */
61	>	char by[NICKLEN];       /**< who activated this connection */
62		};
63
64	+	/*! \brief ListTask structure */
65		struct ListTask
66		{
67	<	int hash_index;       /* the bucket we are currently in */
68	<	dlink_list show_mask; /* show these channels..          */
69	<	dlink_list hide_mask; /* ..and hide these ones          */
70	<	unsigned int users_min, users_max;
71	<	unsigned int created_min, created_max;
72	<	unsigned int topicts_min, topicts_max;
67	>	dlink_list show_mask; /**< show these channels.. */
68	>	dlink_list hide_mask; /**< ..and hide these ones */
69	>
70	>	unsigned int hash_index; /**< the bucket we are currently in */
71	>	unsigned int users_min;
72	>	unsigned int users_max;
73	>	unsigned int created_min;
74	>	unsigned int created_max;
75	>	unsigned int topicts_min;
76	>	unsigned int topicts_max;
77		};
78
79	+	/*! \brief Client structure */
80		struct Client
81		{
82		dlink_node node;
83	<	dlink_node lnode;             /* Used for Server->servers/users */
83	>	dlink_node lnode;             /**< Used for Server->servers/users */
84
85	<	struct Client *hnext;         /* For client hash table lookups by name */
86	<	struct Client *idhnext;       /* For SID hash table lookups by sid */
85	>	struct LocalUser *localClient;
86	>	struct Client    *hnext;      /**< For client hash table lookups by name */
87	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
88	>	struct Server    *serv;       /**< ...defined, if this is a server */
89	>	struct Client    *servptr;    /**< Points to server this Client is on */
90	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
91	>	struct Whowas    *whowas;     /**< Pointers to whowas structs */
92	>	char             *away;       /**< Client's AWAY message. Can be set/unset via AWAY command */
93	>
94	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
95	>	time_t            servicestamp; /**< Last time client has been identified for its nick */
96	>	uint64_t          flags;      /**< client flags */
97	>
98	>	unsigned int      umodes;     /**< opers, normal users subset */
99	>	unsigned int      hopcount;   /**< number of servers to this 0 = local */
100	>	unsigned int      status;     /**< Client type */
101	>	unsigned int      handler;    /**< Handler index */
102
103	<	struct Server*    serv;       /* ...defined, if this is a server */
104	<	struct Client*    servptr;    /* Points to server this Client is on */
105	<	struct Client*    from;       /* == self, if Local Client, *NEVER* NULL! */
106	<
107	<	struct Whowas*    whowas;     /* Pointers to whowas structs */
108	<	time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
109	<	time_t            firsttime;  /* time client was created */
110	<	time_t            since;      /* last time we parsed something */
111	<	time_t            tsinfo;     /* TS on the nick, SVINFO on server */
112	<	unsigned long     connect_id; /* unique connection ID */
113	<	unsigned int      umodes;     /* opers, normal users subset */
114	<	unsigned int      flags;      /* client flags */
115	<
116	<	unsigned short    hopcount;   /* number of servers to this 0 = local */
117	<	unsigned short    status;     /* Client type */
118	<	unsigned char     handler;    /* Handler index */
119	<	unsigned long     serial;     /* used to enforce 1 send per nick */
120	<	unsigned long     lazyLinkClientExists; /* This client exists on the
121	<	* bit mapped lazylink servers
122	<	* mapped here
123	<	*/
124	<	char *away;
125	<	/*
126	<	* client->name is the unique name for a client nick or host
127	<	*/
128	<	char name[HOSTLEN + 1];
129	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
103	>	dlink_list        channel;   /**< chain of channel pointer blocks */
104
105	<	/*
106	<	* client->llname is used to store the clients requested nick
133	<	* temporarily for new connections.
134	<	*/
135	<	char              llname[NICKLEN];
105	>	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
106	>	char id[IDLEN + 1];       /**< client ID, unique ID per client */
107
108		/*
109		* client->username is the username from ident or the USER message,
110		* If the client is idented the USER message is ignored, otherwise
111		* the username part of the USER message is put here prefixed with a
112	<	* tilde depending on the I:line, Once a client has registered, this
113	<	* field should be considered read-only.
112	>	* tilde depending on the auth{} block. Once a client has registered,
113	>	* this field should be considered read-only.
114		*/
115		char              username[USERLEN + 1]; /* client's username */
116
#	Line 157 | Line 128 | struct Client
128		*/
129		char              info[REALLEN + 1]; /* Free form additional client info */
130
131	<	/* client->sockhost contains the ip address gotten from the socket as a
131	>	/*
132	>	* client->sockhost contains the ip address gotten from the socket as a
133		* string, this field should be considered read-only once the connection
134		* has been made. (set in s_bsd.c only)
135		*/
136		char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
137		socket ip address as string */
166	–	/* caller ID allow list */
167	–	/* This has to be here, since a client on an on_allow_list could
168	–	* be a remote client. simpler to keep both here.
169	–	*/
170	–	dlink_list    allow_list;     /* clients I'll allow to talk to me */
171	–	dlink_list    on_allow_list;  /* clients that have =me= on their allow list*/
172	–
173	–	dlink_list     channel;   /* chain of channel pointer blocks */
174	–
175	–	struct LocalUser *localClient;
138		};
139
140	+	/*! \brief LocalUser structure
141	+	*
142	+	* Allocated only for local clients, that are directly connected
143	+	* to \b this server with a socket.
144	+	*/
145		struct LocalUser
146		{
147	<	/*
148	<	* The following fields are allocated only for local clients
149	<	* (directly connected to *this* server with a socket.
150	<	*/
151	<	/* Anti flooding part, all because of lamers... */
152	<	time_t            last_away; /* Away since... */
153	<	time_t            last_join_time;   /* when this client last
154	<	joined a channel */
155	<	time_t            last_leave_time;  /* when this client last
147	>	dlink_node   lclient_node;
148	>
149	>	char         client_host[HOSTLEN + 1];
150	>	char         client_server[HOSTLEN + 1];
151	>
152	>	unsigned int registration;
153	>	unsigned int cap_client;    /**< Client capabilities (from us) */
154	>	unsigned int cap_active;    /**< Active capabilities (to us) */
155	>
156	>	unsigned int operflags;     /**< IRC Operator privilege flags */
157	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
158	>
159	>	unsigned int serial;     /**< used to enforce 1 send per nick */
160	>
161	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
162	>	time_t       firsttime;  /**< time client was created */
163	>	time_t       since;      /**< last time we parsed something */
164	>	time_t       last_knock;    /**< time of last knock */
165	>	time_t       last_away; /**< Away since... */
166	>	time_t       last_join_time;   /**< when this client last
167	>	joined a channel */
168	>	time_t       last_leave_time;  /**< when this client last
169		* left a channel */
170	<	int               join_leave_count; /* count of JOIN/LEAVE in less than
170	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
171		MIN_JOIN_LEAVE_TIME seconds */
172	<	int               oper_warn_count_down; /* warn opers of this possible
172	>	int          oper_warn_count_down; /**< warn opers of this possible
173		spambot every time this gets to 0 */
174	<	time_t            reject_delay;
175	<	time_t            last_caller_id_time;
176	<	time_t            first_received_message_time;
177	<	int               received_number_of_privmsgs;
178	<	int               flood_noticed;
174	>	time_t       reject_delay;
175	>	time_t       last_caller_id_time;
176	>	time_t       first_received_message_time;
177	>	time_t       last_nick_change;
178	>	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
179
180	<	dlink_node        lclient_node;
180	>	int          received_number_of_privmsgs;
181	>	unsigned int number_of_nick_changes;
182
183	<	unsigned int      operflags; /* oper priv flags */
183	>	struct ListTask  *list_task;
184
204	–	struct ListTask   *list_task;
205	–	/* Send and receive dbufs .. */
185		struct dbuf_queue buf_sendq;
186		struct dbuf_queue buf_recvq;
187
188		struct {
189	<	unsigned int messages;      /* Statistics: protocol messages sent/received */
190	<	uint64_t bytes;             /* Statistics: total bytes sent/received */
189	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
190	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
191		} recv, send;
192
193	<	struct Listener *listener;   /* listener accepted from */
194	<	dlink_list        confs;     /* Configuration record associated */
195	<	dlink_list        invited;   /* chain of invite pointer blocks */
193	>	struct AuthRequest *auth;
194	>	struct Listener *listener;   /**< listener accepted from */
195	>	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
196	>	dlink_list        watches;   /**< chain of Watch pointer blocks */
197	>	dlink_list        confs;     /**< Configuration record associated */
198	>	dlink_list        invited;   /**< chain of invite pointer blocks */
199		struct irc_ssaddr ip;
200	<	int               aftype;     /* Makes life easier for DNS res in IPV6 */
219	<	struct DNSQuery   *dns_query; /* result returned from resolver query */
220	<	unsigned long     serverMask; /* Only used for Lazy Links */
221	<	time_t last; /* Last time we got a PRIVMSG */
222	<	time_t            last_nick_change;
223	<	int               number_of_nick_changes;
200	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
201
202		char              *passwd;
203	<	int               caps;       /* capabilities bit-field */
204	<	int               enc_caps;   /* cipher capabilities bit-field */
228	<
229	<	#ifdef HAVE_LIBCRYPTO
230	<	struct EncCapability *in_cipher;
231	<	struct EncCapability *out_cipher;
232	<
233	<	char              in_key[CIPHERKEYLEN];
234	<	char              out_key[CIPHERKEYLEN];
235	<	#endif
203	>	unsigned int       caps;       /**< capabilities bit-field */
204	>	unsigned int       enc_caps;   /**< cipher capabilities bit-field */
205
206		fde_t             fd;
238	–	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
239	–	to servlink */
240	–
241	–	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
242	–	char    *slinkq;              /* sendq for control data */
243	–	int              slinkq_ofs;  /* ofset into slinkq */
244	–	int              slinkq_len;  /* length remaining after slinkq_ofs */
245	–
246	–	struct ZipStats  zipstats;
207
208		/* Anti-flood stuff. We track how many messages were parsed and how
209		* many we were allowed in the current second, and apply a simple
210		* decay to avoid flooding.
211		*   -- adrian
212		*/
213	<	int allow_read;       /* how many we're allowed to read in this second */
214	<	int sent_parsed;      /* how many messages we've parsed in this second */
255	<	time_t last_knock;    /* time of last knock */
256	<	unsigned long random_ping;
213	>	int allow_read;       /**< how many we're allowed to read in this second */
214	>	int sent_parsed;      /**< how many messages we've parsed in this second */
215
216	<	char*          response;  /* expected response from client */
217	<	char*          auth_oper; /* Operator to become if they supply the response.*/
216	>	char*          response;  /**< expected response from client */
217	>	char*          auth_oper; /**< Operator to become if they supply the response.*/
218		};
219
220		/*
#	Line 269 | Line 227 | struct LocalUser
227		#define STAT_SERVER             0x10
228		#define STAT_CLIENT             0x20
229
230	+	#define REG_NEED_USER 0x1
231	+	#define REG_NEED_NICK 0x2
232	+	#define REG_NEED_CAP  0x4
233	+	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
234	+
235		#define HasID(x)                ((x)->id[0] != '\0')
236		#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
237		#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
#	Line 281 | Line 244 | struct LocalUser
244		#define IsServer(x)             ((x)->status == STAT_SERVER)
245		#define IsClient(x)             ((x)->status == STAT_CLIENT)
246
284	–	#define IsOper(x)               ((x)->umodes & UMODE_OPER)
285	–	#define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
286	–
247		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
248		(x)->handler = UNREGISTERED_HANDLER; }
249
#	Line 300 | Line 260 | struct LocalUser
260		(x)->handler = SERVER_HANDLER; }
261
262		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
263	<	(x)->handler = IsOper((x)) ? \
263	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
264		OPER_HANDLER : CLIENT_HANDLER; }
265
266	<	#define SetEob(x)               ((x)->flags |= FLAGS_EOB)
267	<	#define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
266	>	#define MyConnect(x)            ((x)->localClient != NULL)
267	>	#define MyClient(x)             (MyConnect(x) && IsClient(x))
268
269		/*
270		* ts stuff
271		*/
272	<	#define TS_CURRENT      6       /* current TS protocol version */
273	<	#ifdef TS5_ONLY
314	<	#define TS_MIN          5
315	<	#else
316	<	#define TS_MIN          3       /* minimum supported TS protocol version */
317	<	#endif
272	>	#define TS_CURRENT      6       /**< current TS protocol version */
273	>	#define TS_MIN          5       /**< minimum supported TS protocol version */
274		#define TS_DOESTS       0x20000000
275		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
276
277
278	+
279	+	#define CAP_MULTI_PREFIX  0x00000001
280	+
281	+	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
282	+
283		/* housekeeping flags */
284	<	#define FLAGS_PINGSENT    0x00000001 /* Unreplied ping sent                      */
285	<	#define FLAGS_DEADSOCKET  0x00000002 /* Local socket is dead--Exiting soon       */
286	<	#define FLAGS_KILLED      0x00000004 /* Prevents "QUIT" from being sent for this */
287	<	#define FLAGS_CLOSING     0x00000008 /* set when closing to suppress errors      */
288	<	#define FLAGS_GOTID       0x00000010 /* successful ident lookup achieved         */
289	<	#define FLAGS_NEEDID      0x00000020 /* I-lines say must use ident return        */
290	<	#define FLAGS_SENDQEX     0x00000040 /* Sendq exceeded                           */
291	<	#define FLAGS_IPHASH      0x00000080 /* iphashed this client                     */
292	<	#define FLAGS_CRYPTIN     0x00000100 /* incoming data must be decrypted          */
293	<	#define FLAGS_CRYPTOUT    0x00000200 /* outgoing data must be encrypted          */
294	<	#define FLAGS_WAITAUTH    0x00000400 /* waiting for CRYPTLINK AUTH command       */
295	<	#define FLAGS_SERVLINK    0x00000800 /* servlink has servlink process            */
296	<	#define FLAGS_MARK        0x00001000 /* marked client                            */
297	<	#define FLAGS_CANFLOOD    0x00002000 /* client has the ability to flood          */
298	<	#define FLAGS_EXEMPTGLINE 0x00004000 /* client can't be G-lined                  */
299	<	#define FLAGS_EXEMPTKLINE 0x00008000 /* client is exempt from kline              */
300	<	#define FLAGS_NOLIMIT     0x00010000 /* client is exempt from limits             */
301	<	#define FLAGS_RESTRICTED  0x00020000 /* client cannot op others                  */
302	<	#define FLAGS_PING_COOKIE 0x00040000 /* PING Cookie                              */
303	<	#define FLAGS_IDLE_LINED  0x00080000 /* client is exempt from idle-time limits   */
304	<	#define FLAGS_IP_SPOOFING 0x00100000 /* client IP is spoofed                     */
305	<	#define FLAGS_FLOODDONE   0x00200000 /* Flood grace period has been ended.       */
306	<	#define FLAGS_EOB         0x00400000 /* server has received EOB                  */
307	<	#define FLAGS_HIDDEN      0x00800000 /* a hidden server. not shown in /links     */
308	<	#define FLAGS_BLOCKED     0x01000000 /* must wait for COMM_SELECT_WRITE          */
309	<	#define FLAGS_SBLOCKED    0x02000000 /* slinkq is blocked                        */
310	<	#define FLAGS_USERHOST    0x04000000 /* client is in userhost hash               */
311	<	#define FLAGS_BURSTED     0x08000000 /* user was already bursted                 */
312	<	#define FLAGS_EXEMPTRESV  0x10000000 /* client is exempt from RESV               */
313	<	#define FLAGS_GOTUSER     0x20000000 /* if we received a USER command            */
314	<	#define FLAGS_PINGWARNING 0x40000000 /* unreplied ping warning already sent      */
315	<	/*                        0x80000000  */
284	>	#define FLAGS_PINGSENT      0x0000000000000001 /**< Unreplied ping sent */
285	>	#define FLAGS_DEADSOCKET    0x0000000000000002 /**< Local socket is dead--Exiting soon */
286	>	#define FLAGS_KILLED        0x0000000000000004 /**< Prevents "QUIT" from being sent for this */
287	>	#define FLAGS_CLOSING       0x0000000000000008 /**< set when closing to suppress errors */
288	>	#define FLAGS_GOTID         0x0000000000000010 /**< successful ident lookup achieved */
289	>	#define FLAGS_NEEDID        0x0000000000000020 /**< auth{} block say must use ident return */
290	>	#define FLAGS_SENDQEX       0x0000000000000040 /**< Sendq exceeded */
291	>	#define FLAGS_IPHASH        0x0000000000000080 /**< iphashed this client */
292	>	#define FLAGS_UNUSED_       0x0000000000000100 /**< Unused */
293	>	#define FLAGS_UNUSED__      0x0000000000000200 /**< Unused */
294	>	#define FLAGS_UNUSED_____   0x0000000000000400 /**< Unused */
295	>	#define FLAGS_UNUSED______  0x0000000000000800 /**< Unused */
296	>	#define FLAGS_MARK          0x0000000000001000 /**< marked client */
297	>	#define FLAGS_CANFLOOD      0x0000000000002000 /**< client has the ability to flood */
298	>	#define FLAGS_EXEMPTGLINE   0x0000000000004000 /**< client can't be G-lined */
299	>	#define FLAGS_EXEMPTKLINE   0x0000000000008000 /**< client is exempt from kline */
300	>	#define FLAGS_NOLIMIT       0x0000000000010000 /**< client is exempt from limits */
301	>	#define FLAGS_UNUSED___     0x0000000000020000 /**< Unused */
302	>	#define FLAGS_PING_COOKIE   0x0000000000040000 /**< PING Cookie */
303	>	#define FLAGS_UNUSED____    0x0000000000080000 /**< Unused */
304	>	#define FLAGS_IP_SPOOFING   0x0000000000100000 /**< client IP is spoofed */
305	>	#define FLAGS_FLOODDONE     0x0000000000200000 /**< Flood grace period has been ended. */
306	>	#define FLAGS_EOB           0x0000000000400000 /**< server has sent us an EOB */
307	>	#define FLAGS_HIDDEN        0x0000000000800000 /**< a hidden server. not shown in /links */
308	>	#define FLAGS_BLOCKED       0x0000000001000000 /**< must wait for COMM_SELECT_WRITE */
309	>	#define FLAGS_UNUSED_______ 0x0000000002000000 /**< Unused */
310	>	#define FLAGS_USERHOST      0x0000000004000000 /**< client is in userhost hash */
311	>	#define FLAGS_BURSTED       0x0000000008000000 /**< user was already bursted */
312	>	#define FLAGS_EXEMPTRESV    0x0000000010000000 /**< client is exempt from RESV */
313	>	#define FLAGS_GOTUSER       0x0000000020000000 /**< if we received a USER command */
314	>	#define FLAGS_PINGWARNING   0x0000000040000000 /**< unreplied ping warning already sent */
315	>	#define FLAGS_FINISHED_AUTH 0x0000000080000000 /**< Client has been released from auth */
316	>	#define FLAGS_FLOOD_NOTICED 0x0000000100000000 /**< Notice to opers about this flooder has been sent */
317	>	#define FLAGS_SERVICE       0x0000000200000000 /**< Client/server is a network service */
318	>
319	>	#define HasFlag(x, y) ((x)->flags &   (y))
320	>	#define AddFlag(x, y) ((x)->flags |=  (y))
321	>	#define DelFlag(x, y) ((x)->flags &= ~(y))
322	>
323
324
325		/* umodes, settable flags */
326	<	#define UMODE_SERVNOTICE   0x00001 /* server notices such as kill */
327	<	#define UMODE_CCONN        0x00002 /* Client Connections */
328	<	#define UMODE_REJ          0x00004 /* Bot Rejections */
329	<	#define UMODE_SKILL        0x00008 /* Server Killed */
330	<	#define UMODE_FULL         0x00010 /* Full messages */
331	<	#define UMODE_SPY          0x00020 /* see STATS / LINKS */
332	<	#define UMODE_DEBUG        0x00040 /* 'debugging' info */
333	<	#define UMODE_NCHANGE      0x00080 /* Nick change notice */
334	<	#define UMODE_WALLOP       0x00100 /* send wallops to them */
335	<	#define UMODE_OPERWALL     0x00200 /* Operwalls */
336	<	#define UMODE_INVISIBLE    0x00400 /* makes user invisible */
337	<	#define UMODE_BOTS         0x00800 /* shows bots */
338	<	#define UMODE_EXTERNAL     0x01000 /* show servers introduced and splitting */
339	<	#define UMODE_CALLERID     0x02000 /* block unless caller id's */
340	<	#define UMODE_SOFTCALLERID 0x04000 /* block unless on common channel */
341	<	#define UMODE_UNAUTH       0x08000 /* show unauth connects here */
342	<	#define UMODE_LOCOPS       0x10000 /* show locops */
343	<	#define UMODE_DEAF         0x20000 /* don't receive channel messages */
344	<
345	<	/* user information flags, only settable by remote mode or local oper */
346	<	#define UMODE_OPER         0x40000 /* Operator */
347	<	#define UMODE_ADMIN        0x80000 /* Admin on server */
348	<	#define UMODE_ALL          UMODE_SERVNOTICE
326	>	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
327	>	#define UMODE_CCONN        0x00000002 /**< Client Connections */
328	>	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
329	>	#define UMODE_SKILL        0x00000008 /**< Server Killed */
330	>	#define UMODE_FULL         0x00000010 /**< Full messages */
331	>	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
332	>	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
333	>	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
334	>	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
335	>	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
336	>	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
337	>	#define UMODE_BOTS         0x00000800 /**< shows bots */
338	>	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
339	>	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
340	>	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
341	>	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
342	>	#define UMODE_LOCOPS       0x00010000 /**< show locops */
343	>	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
344	>	#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
345	>	#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
346	>	#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
347	>	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
348	>	#define UMODE_OPER         0x40000000 /**< Operator */
349	>	#define UMODE_ADMIN        0x80000000 /**< Admin on server */
350	>
351	>	#define UMODE_ALL          UMODE_SERVNOTICE
352	>
353	>	#define HasUMode(x, y) ((x)->umodes &   (y))
354	>	#define AddUMode(x, y) ((x)->umodes |=  (y))
355	>	#define DelUMode(x, y) ((x)->umodes &= ~(y))
356
357		#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
358	<	UMODE_ADMIN)
358	>	UMODE_REGISTERED | UMODE_ADMIN | UMODE_HIDDEN)
359	>
360
361
362		/* oper priv flags */
363	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
364	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
365	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
366	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
367	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
368	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
369	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
370	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
371	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
372	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
373	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
374	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
375	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
376	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
377	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
363	>	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
364	>	#define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
365	>	#define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
366	>	#define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
367	>	#define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
368	>	#define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
369	>	#define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
370	>	#define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
371	>	#define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
372	>	#define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
373	>	#define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
374	>	#define OPER_FLAG_OPER_SPY     0x00000800 /* */
375	>	#define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
376	>	#define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
377	>	#define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
378	>	#define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
379	>	#define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
380	>	#define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
381	>
382	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
383	>	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
384	>	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
385	>	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
386
403	–	#define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
387
388
389		/* flags macros. */
390	+	#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
391		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
392		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
393		#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
394		#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
411	–	#define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
412	–	#define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
413	–	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
414	–	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
415	–	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
416	–	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
417	–	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
418	–	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
419	–	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
420	–	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
421	–	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
422	–	#define MyConnect(x)            ((x)->localClient != NULL)
423	–	#define MyClient(x)             (MyConnect(x) && IsClient(x))
424	–	#define SetMark(x)              ((x)->flags |= FLAGS_MARK)
425	–	#define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
426	–	#define IsMarked(x)             ((x)->flags & FLAGS_MARK)
395		#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
396		#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
397		#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
398		FLAGS_KILLED))
399
400		/* oper flags */
401	<	#define MyOper(x)               (MyConnect(x) && IsOper(x))
401	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
402
403		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
404		if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
405
406		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
407	<	if (!IsOper((x)) && !IsServer((x))) \
407	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
408		(x)->handler = CLIENT_HANDLER; }
409
442	–	#define IsPrivileged(x)         (IsOper(x) || IsServer(x))
443	–
444	–	/* umode flags */
445	–	#define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
446	–	#define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
447	–	#define IsSetCallerId(x)        ((x)->umodes & \
448	–	(UMODE_CALLERID|UMODE_SOFTCALLERID))
449	–	#define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
450	–	#define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
451	–
410		#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
411		#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
412
#	Line 485 | Line 443 | struct LocalUser
443		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
444		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
445
488	–	#define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
489	–	#define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
490	–	#define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
491	–	#define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
492	–
446		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
447		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
448		#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
#	Line 500 | Line 453 | struct LocalUser
453		#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
454		#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
455		#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
503	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
504	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
505	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
506	–
507	–	#define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
508	–	#define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
509	–	#define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
456
457		#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
458		#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
459		#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
460
515	–	/* operflags macros */
516	–	#define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
517	–	#define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
518	–	#define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
519	–	#define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
520	–	#define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
521	–	#define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
522	–	#define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
523	–	#define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
524	–	#define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
525	–	#define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
526	–	#define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
527	–	#define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
528	–	#define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
529	–	#define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
530	–	#define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
461
462		/*
463		* definitions for get_client_name
#	Line 542 | Line 472 | extern dlink_list listing_client_list;
472		extern dlink_list global_client_list;
473
474		extern int accept_message(struct Client *, struct Client *);
475	<	extern void set_initial_nick(struct Client *, struct Client *, const char *);
475	>	extern struct split_nuh_item *find_accept(const char *, const char *,
476	>	const char *, struct Client *, int);
477	>	extern void del_accept(struct split_nuh_item *, struct Client *);
478	>	extern void del_all_accepts(struct Client *);
479		extern void exit_client(struct Client *, struct Client *, const char *);
480		extern void check_conf_klines(void);
481		extern void init_client(void);
549	–	extern void del_from_accept(struct Client *, struct Client *);
550	–	extern void del_all_accepts(struct Client *);
551	–	extern void del_all_their_accepts(struct Client *);
552	–	extern void change_local_nick(struct Client *, struct Client *, const char *);
482		extern void dead_link_on_write(struct Client *, int);
483		extern void dead_link_on_read(struct Client *, int);
484		extern void exit_aborted_clients(void);
#	Line 557 | Line 486 | extern void free_exited_clients(void);
486		extern struct Client *make_client(struct Client *);
487		extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
488		extern struct Client *find_person(const struct Client *const, const char *);
489	<	extern const char *get_client_name(struct Client *, int);
489	>	extern const char *get_client_name(const struct Client *, int);
490
491		#endif /* INCLUDED_client_h */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)