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

Diff Legend

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