ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/include/client.h

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

Diff Legend

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