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

Diff Legend

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