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 1559 by michael, Sun Oct 14 01:38:28 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"
34	–	#include "irc_res.h"
35	–
36	–	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
37	–	#define PASSWDLEN       20
38	–	#define CIPHERKEYLEN    64 /* 512bit */
39	–	#define IDLEN           12 /* this is the maximum length, not the actual
40	–	generated length; DO NOT CHANGE! */
41	–
42	–	/*
43	–	* pre declare structs
44	–	*/
45	–	struct AccessItem;
46	–	struct Whowas;
47	–	struct DNSReply;
48	–	struct Listener;
49	–	struct Client;
50	–	struct LocalUser;
51	–
52	–	/*
53	–	* Client structures
54	–	*/
37
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	–	};
38
39	<	struct SlinkRpl
39	>	/*! \brief addr_mask_type enumeration */
40	>	enum addr_mask_type
41		{
42	<	int command;
43	<	int datalen;
44	<	int gotdatalen;
71	<	int readdata;
72	<	unsigned char *data;
42	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
43	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
44	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
45		};
46
47	<	struct ZipStats
47	>	/*! \brief Server structure */
48	>	struct Server
49		{
50	<	unsigned long in;
51	<	unsigned long in_wire;
52	<	unsigned long out;
80	<	unsigned long out_wire;
81	<	double in_ratio;
82	<	double out_ratio;
50	>	dlink_list server_list; /**< Servers on this server */
51	>	dlink_list client_list; /**< Clients on this server */
52	>	char by[NICKLEN + 1];   /**< who activated this connection */
53		};
54
55	+	/*! \brief ListTask structure */
56		struct ListTask
57		{
58	<	int hash_index;       /* the bucket we are currently in */
59	<	dlink_list show_mask; /* show these channels..          */
60	<	dlink_list hide_mask; /* ..and hide these ones          */
61	<	unsigned int users_min, users_max;
62	<	unsigned int created_min, created_max;
63	<	unsigned int topicts_min, topicts_max;
58	>	dlink_list show_mask; /**< show these channels.. */
59	>	dlink_list hide_mask; /**< ..and hide these ones */
60	>
61	>	unsigned int hash_index; /**< the bucket we are currently in */
62	>	unsigned int users_min;
63	>	unsigned int users_max;
64	>	unsigned int created_min;
65	>	unsigned int created_max;
66	>	unsigned int topicts_min;
67	>	unsigned int topicts_max;
68		};
69
70	<	struct Client
70	>	/*! \brief LocalUser structure
71	>	*
72	>	* Allocated only for local clients, that are directly connected
73	>	* to \b this server with a socket.
74	>	*/
75	>	struct LocalUser
76		{
77	<	dlink_node node;
98	<	dlink_node lnode;             /* Used for Server->servers/users */
77	>	dlink_node   lclient_node;
78
79	<	struct Client *hnext;         /* For client hash table lookups by name */
80	<	struct Client *idhnext;       /* For SID hash table lookups by sid */
79	>	char         client_host[HOSTLEN + 1];
80	>	char         client_server[HOSTLEN + 1];
81
82	<	struct Server*    serv;       /* ...defined, if this is a server */
83	<	struct Client*    servptr;    /* Points to server this Client is on */
84	<	struct Client*    from;       /* == self, if Local Client, *NEVER* NULL! */
85	<
86	<	struct Whowas*    whowas;     /* Pointers to whowas structs */
87	<	time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
88	<	time_t            firsttime;  /* time client was created */
89	<	time_t            since;      /* last time we parsed something */
90	<	time_t            tsinfo;     /* TS on the nick, SVINFO on server */
91	<	unsigned long     connect_id; /* unique connection ID */
92	<	unsigned int      umodes;     /* opers, normal users subset */
93	<	unsigned int      flags;      /* client flags */
94	<
95	<	unsigned short    hopcount;   /* number of servers to this 0 = local */
96	<	unsigned short    status;     /* Client type */
97	<	unsigned char     handler;    /* Handler index */
98	<	unsigned long     serial;     /* used to enforce 1 send per nick */
99	<	unsigned long     lazyLinkClientExists; /* This client exists on the
100	<	* bit mapped lazylink servers
101	<	* mapped here
102	<	*/
103	<	char *away;
104	<	/*
105	<	* client->name is the unique name for a client nick or host
106	<	*/
107	<	char name[HOSTLEN + 1];
108	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
82	>	unsigned int registration;
83	>	unsigned int cap_client;    /**< Client capabilities (from us) */
84	>	unsigned int cap_active;    /**< Active capabilities (to us) */
85	>	unsigned int       caps;       /**< capabilities bit-field */
86	>
87	>	unsigned int operflags;     /**< IRC Operator privilege flags */
88	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
89	>
90	>	unsigned int serial;     /**< used to enforce 1 send per nick */
91	>
92	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
93	>	time_t       firsttime;  /**< time client was created */
94	>	time_t       since;      /**< last time we parsed something */
95	>	time_t       last_knock;    /**< time of last knock */
96	>	time_t       last_join_time;   /**< when this client last
97	>	joined a channel */
98	>	time_t       last_leave_time;  /**< when this client last
99	>	* left a channel */
100	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
101	>	MIN_JOIN_LEAVE_TIME seconds */
102	>	int          oper_warn_count_down; /**< warn opers of this possible
103	>	spambot every time this gets to 0 */
104	>	time_t       last_caller_id_time;
105	>	time_t       first_received_message_time;
106	>	time_t       last_nick_change;
107	>	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
108	>	time_t       last_away; /**< Away since... */
109
110	<	/*
111	<	* client->llname is used to store the clients requested nick
112	<	* temporarily for new connections.
110	>	int          received_number_of_privmsgs;
111	>	unsigned int number_of_nick_changes;
112	>
113	>	struct ListTask  *list_task;
114	>
115	>	struct dbuf_queue buf_sendq;
116	>	struct dbuf_queue buf_recvq;
117	>
118	>	struct {
119	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
120	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
121	>	} recv, send;
122	>
123	>	struct AuthRequest *auth;
124	>	struct Listener *listener;   /**< listener accepted from */
125	>	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
126	>	dlink_list        watches;   /**< chain of Watch pointer blocks */
127	>	dlink_list        confs;     /**< Configuration record associated */
128	>	dlink_list        invited;   /**< chain of invite pointer blocks */
129	>	struct irc_ssaddr ip;
130	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
131	>
132	>	char              *passwd;
133	>	fde_t             fd;
134	>
135	>	/* Anti-flood stuff. We track how many messages were parsed and how
136	>	* many we were allowed in the current second, and apply a simple
137	>	* decay to avoid flooding.
138	>	*   -- adrian
139		*/
140	<	char              llname[NICKLEN];
140	>	int allow_read;       /**< how many we're allowed to read in this second */
141	>	int sent_parsed;      /**< how many messages we've parsed in this second */
142
143	+	char*          response;  /**< expected response from client */
144	+	char*          auth_oper; /**< Operator to become if they supply the response.*/
145	+	};
146	+
147	+	/*! \brief Client structure */
148	+	struct Client
149	+	{
150	+	dlink_node node;
151	+	dlink_node lnode;             /**< Used for Server->servers/users */
152	+
153	+	struct LocalUser *localClient;
154	+	struct Client    *hnext;      /**< For client hash table lookups by name */
155	+	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
156	+	struct Server    *serv;       /**< ...defined, if this is a server */
157	+	struct Client    *servptr;    /**< Points to server this Client is on */
158	+	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
159	+
160	+	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
161	+
162	+	unsigned int      flags;      /**< client flags */
163	+	unsigned int      umodes;     /**< opers, normal users subset */
164	+	unsigned int      hopcount;   /**< number of servers to this 0 = local */
165	+	unsigned int      status;     /**< Client type */
166	+	unsigned int      handler;    /**< Handler index */
167	+
168	+	dlink_list        whowas;
169	+	dlink_list        channel;   /**< chain of channel pointer blocks */
170	+
171	+	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
172	+	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
173	+	char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
174	+	if dealing with timestamps */
175	+	char id[IDLEN + 1];       /**< client ID, unique ID per client */
176		/*
177		* client->username is the username from ident or the USER message,
178		* If the client is idented the USER message is ignored, otherwise
179		* the username part of the USER message is put here prefixed with a
180	<	* tilde depending on the I:line, Once a client has registered, this
181	<	* field should be considered read-only.
180	>	* tilde depending on the auth{} block. Once a client has registered,
181	>	* this field should be considered read-only.
182		*/
183		char              username[USERLEN + 1]; /* client's username */
184
#	Line 157 | Line 196 | struct Client
196		*/
197		char              info[REALLEN + 1]; /* Free form additional client info */
198
199	<	/* client->sockhost contains the ip address gotten from the socket as a
199	>	/*
200	>	* client->sockhost contains the ip address gotten from the socket as a
201		* string, this field should be considered read-only once the connection
202		* has been made. (set in s_bsd.c only)
203		*/
204		char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
205		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;
177	–	};
178	–
179	–	struct LocalUser
180	–	{
181	–	/*
182	–	* The following fields are allocated only for local clients
183	–	* (directly connected to *this* server with a socket.
184	–	*/
185	–	/* Anti flooding part, all because of lamers... */
186	–	time_t            last_away; /* Away since... */
187	–	time_t            last_join_time;   /* when this client last
188	–	joined a channel */
189	–	time_t            last_leave_time;  /* when this client last
190	–	* left a channel */
191	–	int               join_leave_count; /* count of JOIN/LEAVE in less than
192	–	MIN_JOIN_LEAVE_TIME seconds */
193	–	int               oper_warn_count_down; /* warn opers of this possible
194	–	spambot every time this gets to 0 */
195	–	time_t            reject_delay;
196	–	time_t            last_caller_id_time;
197	–	time_t            first_received_message_time;
198	–	int               received_number_of_privmsgs;
199	–	int               flood_noticed;
200	–
201	–	dlink_node        lclient_node;
202	–
203	–	unsigned int      operflags; /* oper priv flags */
204	–
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 */
213	–	} recv, send;
214	–
215	–	struct Listener *listener;   /* listener accepted from */
216	–	dlink_list        confs;      /* Configuration record associated */
217	–
218	–	struct irc_ssaddr ip;
219	–	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;
226	–
227	–	char              *passwd;
228	–	int               caps;       /* capabilities bit-field */
229	–	int               enc_caps;   /* cipher capabilities bit-field */
230	–
231	–	#ifdef HAVE_LIBCRYPTO
232	–	struct EncCapability *in_cipher;
233	–	struct EncCapability *out_cipher;
234	–
235	–	char              in_key[CIPHERKEYLEN];
236	–	char              out_key[CIPHERKEYLEN];
237	–	#endif
238	–
239	–	fde_t             fd;
240	–	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
241	–	to servlink */
242	–
243	–	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
244	–	char    *slinkq;              /* sendq for control data */
245	–	int              slinkq_ofs;  /* ofset into slinkq */
246	–	int              slinkq_len;  /* length remaining after slinkq_ofs */
247	–
248	–	struct ZipStats  zipstats;
249	–
250	–	/* Anti-flood stuff. We track how many messages were parsed and how
251	–	* many we were allowed in the current second, and apply a simple
252	–	* decay to avoid flooding.
253	–	*   -- adrian
254	–	*/
255	–	int allow_read;       /* how many we're allowed to read in this second */
256	–	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;
259	–
260	–	char*          response;  /* expected response from client */
261	–	char*          auth_oper; /* Operator to become if they supply the response.*/
206		};
207
208		/*
#	Line 271 | Line 215 | struct LocalUser
215		#define STAT_SERVER             0x10
216		#define STAT_CLIENT             0x20
217
218	+	#define REG_NEED_USER 0x1
219	+	#define REG_NEED_NICK 0x2
220	+	#define REG_NEED_CAP  0x4
221	+	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
222	+
223		#define HasID(x)                ((x)->id[0] != '\0')
224		#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
225		#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
#	Line 283 | Line 232 | struct LocalUser
232		#define IsServer(x)             ((x)->status == STAT_SERVER)
233		#define IsClient(x)             ((x)->status == STAT_CLIENT)
234
286	–	#define IsOper(x)               ((x)->umodes & UMODE_OPER)
287	–	#define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
288	–
235		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
236		(x)->handler = UNREGISTERED_HANDLER; }
237
#	Line 302 | Line 248 | struct LocalUser
248		(x)->handler = SERVER_HANDLER; }
249
250		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
251	<	(x)->handler = IsOper((x)) ? \
251	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
252		OPER_HANDLER : CLIENT_HANDLER; }
253
254	<	#define SetEob(x)               ((x)->flags |= FLAGS_EOB)
255	<	#define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
254	>	#define MyConnect(x)            ((x)->localClient != NULL)
255	>	#define MyClient(x)             (MyConnect(x) && IsClient(x))
256
257		/*
258		* ts stuff
259		*/
260	<	#define TS_CURRENT      6       /* current TS protocol version */
261	<	#ifdef TS5_ONLY
316	<	#define TS_MIN          5
317	<	#else
318	<	#define TS_MIN          3       /* minimum supported TS protocol version */
319	<	#endif
260	>	#define TS_CURRENT      6       /**< current TS protocol version */
261	>	#define TS_MIN          5       /**< minimum supported TS protocol version */
262		#define TS_DOESTS       0x20000000
263		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
264
265
266	+
267	+	#define CAP_MULTI_PREFIX  0x00000001
268	+
269	+	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
270	+
271		/* housekeeping flags */
272	<	#define FLAGS_PINGSENT    0x00000001 /* Unreplied ping sent                      */
273	<	#define FLAGS_DEADSOCKET  0x00000002 /* Local socket is dead--Exiting soon       */
274	<	#define FLAGS_KILLED      0x00000004 /* Prevents "QUIT" from being sent for this */
275	<	#define FLAGS_CLOSING     0x00000008 /* set when closing to suppress errors      */
276	<	#define FLAGS_GOTID       0x00000010 /* successful ident lookup achieved         */
277	<	#define FLAGS_NEEDID      0x00000020 /* I-lines say must use ident return        */
278	<	#define FLAGS_SENDQEX     0x00000040 /* Sendq exceeded                           */
279	<	#define FLAGS_IPHASH      0x00000080 /* iphashed this client                     */
280	<	#define FLAGS_CRYPTIN     0x00000100 /* incoming data must be decrypted          */
281	<	#define FLAGS_CRYPTOUT    0x00000200 /* outgoing data must be encrypted          */
282	<	#define FLAGS_WAITAUTH    0x00000400 /* waiting for CRYPTLINK AUTH command       */
283	<	#define FLAGS_SERVLINK    0x00000800 /* servlink has servlink process            */
284	<	#define FLAGS_MARK        0x00001000 /* marked client                            */
285	<	#define FLAGS_CANFLOOD    0x00002000 /* client has the ability to flood          */
286	<	#define FLAGS_EXEMPTGLINE 0x00004000 /* client can't be G-lined                  */
287	<	#define FLAGS_EXEMPTKLINE 0x00008000 /* client is exempt from kline              */
288	<	#define FLAGS_NOLIMIT     0x00010000 /* client is exempt from limits             */
289	<	#define FLAGS_RESTRICTED  0x00020000 /* client cannot op others                  */
290	<	#define FLAGS_PING_COOKIE 0x00040000 /* PING Cookie                              */
291	<	#define FLAGS_IDLE_LINED  0x00080000 /* client is exempt from idle-time limits   */
292	<	#define FLAGS_IP_SPOOFING 0x00100000 /* client IP is spoofed                     */
293	<	#define FLAGS_FLOODDONE   0x00200000 /* Flood grace period has been ended.       */
294	<	#define FLAGS_EOB         0x00400000 /* server has received EOB                  */
295	<	#define FLAGS_HIDDEN      0x00800000 /* a hidden server. not shown in /links     */
296	<	#define FLAGS_BLOCKED     0x01000000 /* must wait for COMM_SELECT_WRITE          */
297	<	#define FLAGS_SBLOCKED    0x02000000 /* slinkq is blocked                        */
298	<	#define FLAGS_USERHOST    0x04000000 /* client is in userhost hash               */
299	<	#define FLAGS_BURSTED     0x08000000 /* user was already bursted                 */
300	<	#define FLAGS_EXEMPTRESV  0x10000000 /* client is exempt from RESV               */
301	<	#define FLAGS_GOTUSER     0x20000000 /* if we received a USER command            */
302	<	#define FLAGS_PINGWARNING 0x40000000 /* unreplied ping warning already sent      */
303	<	/*                        0x80000000  */
272	>	#define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
273	>	#define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
274	>	#define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
275	>	#define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
276	>	#define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
277	>	#define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
278	>	#define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
279	>	#define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
280	>	#define FLAGS_MARK          0x00000100 /**< marked client */
281	>	#define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
282	>	#define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
283	>	#define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
284	>	#define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
285	>	#define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
286	>	#define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
287	>	#define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
288	>	#define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
289	>	#define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
290	>	#define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
291	>	#define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
292	>	#define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
293	>	#define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
294	>	#define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
295	>	#define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
296	>	#define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
297	>	#define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
298	>	#define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
299	>
300	>	#define HasFlag(x, y) ((x)->flags &   (y))
301	>	#define AddFlag(x, y) ((x)->flags |=  (y))
302	>	#define DelFlag(x, y) ((x)->flags &= ~(y))
303	>
304
305
306		/* umodes, settable flags */
307	<	#define UMODE_SERVNOTICE   0x00001 /* server notices such as kill */
308	<	#define UMODE_CCONN        0x00002 /* Client Connections */
309	<	#define UMODE_REJ          0x00004 /* Bot Rejections */
310	<	#define UMODE_SKILL        0x00008 /* Server Killed */
311	<	#define UMODE_FULL         0x00010 /* Full messages */
312	<	#define UMODE_SPY          0x00020 /* see STATS / LINKS */
313	<	#define UMODE_DEBUG        0x00040 /* 'debugging' info */
314	<	#define UMODE_NCHANGE      0x00080 /* Nick change notice */
315	<	#define UMODE_WALLOP       0x00100 /* send wallops to them */
316	<	#define UMODE_OPERWALL     0x00200 /* Operwalls */
317	<	#define UMODE_INVISIBLE    0x00400 /* makes user invisible */
318	<	#define UMODE_BOTS         0x00800 /* shows bots */
319	<	#define UMODE_EXTERNAL     0x01000 /* show servers introduced and splitting */
320	<	#define UMODE_CALLERID     0x02000 /* block unless caller id's */
321	<	#define UMODE_SOFTCALLERID 0x04000 /* block unless on common channel */
322	<	#define UMODE_UNAUTH       0x08000 /* show unauth connects here */
323	<	#define UMODE_LOCOPS       0x10000 /* show locops */
324	<	#define UMODE_DEAF         0x20000 /* don't receive channel messages */
325	<
326	<	/* user information flags, only settable by remote mode or local oper */
327	<	#define UMODE_OPER         0x40000 /* Operator */
328	<	#define UMODE_ADMIN        0x80000 /* Admin on server */
329	<	#define UMODE_ALL          UMODE_SERVNOTICE
307	>	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
308	>	#define UMODE_CCONN        0x00000002 /**< Client Connections */
309	>	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
310	>	#define UMODE_SKILL        0x00000008 /**< Server Killed */
311	>	#define UMODE_FULL         0x00000010 /**< Full messages */
312	>	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
313	>	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
314	>	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
315	>	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
316	>	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
317	>	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
318	>	#define UMODE_BOTS         0x00000800 /**< shows bots */
319	>	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
320	>	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
321	>	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
322	>	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
323	>	#define UMODE_LOCOPS       0x00010000 /**< show locops */
324	>	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
325	>	#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
326	>	#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
327	>	#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
328	>	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
329	>	#define UMODE_OPER         0x00400000 /**< Operator */
330	>	#define UMODE_ADMIN        0x00800000 /**< Admin on server */
331	>
332	>	#define UMODE_ALL          UMODE_SERVNOTICE
333	>
334	>	#define HasUMode(x, y) ((x)->umodes &   (y))
335	>	#define AddUMode(x, y) ((x)->umodes |=  (y))
336	>	#define DelUMode(x, y) ((x)->umodes &= ~(y))
337	>
338	>	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
339	>	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
340	>	UMODE_HIDDEN)
341
384	–	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
385	–	UMODE_ADMIN)
342
343
344		/* oper priv flags */
345	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
346	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
347	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
348	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
349	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
350	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
351	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
352	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
353	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
354	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
355	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
356	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
357	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
358	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
359	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
345	>	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
346	>	#define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
347	>	#define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
348	>	#define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
349	>	#define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
350	>	#define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
351	>	#define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
352	>	#define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
353	>	#define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
354	>	#define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
355	>	#define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
356	>	#define OPER_FLAG_OPER_SPY     0x00000800 /* */
357	>	#define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
358	>	#define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
359	>	#define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
360	>	#define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
361	>	#define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
362	>	#define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
363	>	#define OPER_FLAG_SET          0x00040000 /**< Oper can use SET command */
364	>
365	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
366	>	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
367	>	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
368	>	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
369
405	–	#define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
370
371
372		/* flags macros. */
373	+	#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
374		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
375		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
376		#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
377		#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
413	–	#define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
414	–	#define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
415	–	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
416	–	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
417	–	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
418	–	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
419	–	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
420	–	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
421	–	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
422	–	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
423	–	#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)
378		#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
379		#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
380		#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
381		FLAGS_KILLED))
382
383		/* oper flags */
384	<	#define MyOper(x)               (MyConnect(x) && IsOper(x))
384	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
385
386		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
387		if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
388
389		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
390	<	if (!IsOper((x)) && !IsServer((x))) \
390	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
391		(x)->handler = CLIENT_HANDLER; }
392
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	–
393		#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
394		#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
395
#	Line 487 | Line 426 | struct LocalUser
426		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
427		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
428
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	–
429		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
430		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
431		#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
#	Line 502 | Line 436 | struct LocalUser
436		#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
437		#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
438		#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
505	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
506	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
507	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
508	–
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	–
513	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
514	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
515	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
516	–
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)
439
534	–	/*
535	–	* definitions for get_client_name
536	–	* TBD - make this an enum
537	–	*/
538	–	#define HIDE_IP 0
539	–	#define SHOW_IP 1
540	–	#define MASK_IP 2
440
441		extern struct Client me;
442		extern dlink_list listing_client_list;
443		extern dlink_list global_client_list;
444
445		extern int accept_message(struct Client *, struct Client *);
446	<	extern void set_initial_nick(struct Client *, struct Client *, const char *);
446	>	extern struct split_nuh_item *find_accept(const char *, const char *,
447	>	const char *, struct Client *, int);
448	>	extern void del_accept(struct split_nuh_item *, struct Client *);
449	>	extern void del_all_accepts(struct Client *);
450		extern void exit_client(struct Client *, struct Client *, const char *);
451		extern void check_conf_klines(void);
452		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 *);
453		extern void dead_link_on_write(struct Client *, int);
454		extern void dead_link_on_read(struct Client *, int);
455		extern void exit_aborted_clients(void);
#	Line 559 | Line 457 | extern void free_exited_clients(void);
457		extern struct Client *make_client(struct Client *);
458		extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
459		extern struct Client *find_person(const struct Client *const, const char *);
460	<	extern const char *get_client_name(struct Client *, int);
460	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
461
462		#endif /* INCLUDED_client_h */

Diff Legend

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