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 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 4588 by michael, Tue Aug 26 15:59:07 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.h: The ircd client header.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file client.h
23	+	* \brief Header including structures, macros and prototypes for client handling
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		#ifndef INCLUDED_client_h
29		#define INCLUDED_client_h
30
31	+	#include "list.h"
32		#include "fdlist.h"
33	<	#include "setup.h"
33	>	#include "config.h"
34		#include "ircd_defs.h"
31	–	#include "ircd_handler.h"
35		#include "dbuf.h"
36		#include "channel.h"
37	<	#include "irc_res.h"
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	<	struct Server
54	<	{
55	<	char by[NICKLEN];       /* who activated this connection     */
56	<	struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
57	<	dlink_list server_list; /* Servers on this server            */
58	<	dlink_list client_list; /* Clients on this server            */
59	<	};
60	<
61	<	struct SlinkRpl
62	<	{
63	<	int command;
64	<	int datalen;
65	<	int gotdatalen;
66	<	int readdata;
67	<	unsigned char *data;
68	<	};
69	<
70	<	struct ZipStats
71	<	{
72	<	unsigned long in;
73	<	unsigned long in_wire;
74	<	unsigned long out;
75	<	unsigned long out_wire;
76	<	double in_ratio;
77	<	double out_ratio;
78	<	};
79	<
80	<	struct ListTask
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;
88	<	};
89	<
90	<	struct Client
91	<	{
92	<	dlink_node node;
93	<	dlink_node lnode;             /* Used for Server->servers/users */
94	<
95	<	struct Client *hnext;         /* For client hash table lookups by name */
96	<	struct Client *idhnext;       /* For SID hash table lookups by sid */
97	<
98	<	struct Server*    serv;       /* ...defined, if this is a server */
99	<	struct Client*    servptr;    /* Points to server this Client is on */
100	<	struct Client*    from;       /* == self, if Local Client, *NEVER* NULL! */
101	<
102	<	struct Whowas*    whowas;     /* Pointers to whowas structs */
103	<	time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
104	<	time_t            firsttime;  /* time client was created */
105	<	time_t            since;      /* last time we parsed something */
106	<	time_t            tsinfo;     /* TS on the nick, SVINFO on server */
107	<	unsigned long     connect_id; /* unique connection ID */
108	<	unsigned int      umodes;     /* opers, normal users subset */
109	<	unsigned int      flags;      /* client flags */
110	<
111	<	unsigned short    hopcount;   /* number of servers to this 0 = local */
112	<	unsigned short    status;     /* Client type */
113	<	unsigned char     handler;    /* Handler index */
114	<	unsigned long     serial;     /* used to enforce 1 send per nick */
115	<	char *away;
116	<	/*
117	<	* client->name is the unique name for a client nick or host
118	<	*/
119	<	char name[HOSTLEN + 1];
120	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
121	<
122	<	/*
123	<	* client->username is the username from ident or the USER message,
124	<	* If the client is idented the USER message is ignored, otherwise
125	<	* the username part of the USER message is put here prefixed with a
126	<	* tilde depending on the I:line, Once a client has registered, this
127	<	* field should be considered read-only.
128	<	*/
129	<	char              username[USERLEN + 1]; /* client's username */
130	<
131	<	/*
132	<	* client->host contains the resolved name or ip address
133	<	* as a string for the user, it may be fiddled with for oper spoofing etc.
134	<	* once it's changed the *real* address goes away. This should be
135	<	* considered a read-only field after the client has registered.
136	<	*/
137	<	char              host[HOSTLEN + 1];     /* client's hostname */
138	<
139	<	/*
140	<	* client->info for unix clients will normally contain the info from the
141	<	* gcos field in /etc/passwd but anything can go here.
142	<	*/
143	<	char              info[REALLEN + 1]; /* Free form additional client info */
144	<	char              client_host[HOSTLEN + 1];
145	<	char              client_server[HOSTLEN + 1];
146	<
147	<	/* client->sockhost contains the ip address gotten from the socket as a
148	<	* string, this field should be considered read-only once the connection
149	<	* has been made. (set in s_bsd.c only)
150	<	*/
151	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
152	<	socket ip address as string */
153	<	dlink_list        channel;   /* chain of channel pointer blocks */
154	<
155	<	struct LocalUser *localClient;
156	<	};
157	<
158	<	struct LocalUser
159	<	{
160	<	/*
161	<	* The following fields are allocated only for local clients
162	<	* (directly connected to *this* server with a socket.
163	<	*/
164	<	unsigned int registration;
165	<	unsigned int cap_client;    /* Client capabilities (from us) */
166	<	unsigned int cap_active;    /* Active capabilities (to us) */
167	<
168	<	/* Anti flooding part, all because of lamers... */
169	<	time_t            last_away; /* Away since... */
170	<	time_t            last_join_time;   /* when this client last
171	<	joined a channel */
172	<	time_t            last_leave_time;  /* when this client last
173	<	* left a channel */
174	<	int               join_leave_count; /* count of JOIN/LEAVE in less than
175	<	MIN_JOIN_LEAVE_TIME seconds */
176	<	int               oper_warn_count_down; /* warn opers of this possible
177	<	spambot every time this gets to 0 */
178	<	time_t            reject_delay;
179	<	time_t            last_caller_id_time;
180	<	time_t            first_received_message_time;
181	<	int               received_number_of_privmsgs;
182	<	int               flood_noticed;
183	<
184	<	dlink_node        lclient_node;
185	<
186	<	unsigned int      operflags; /* oper priv flags */
187	<
188	<	struct ListTask   *list_task;
189	<	/* Send and receive dbufs .. */
190	<	struct dbuf_queue buf_sendq;
191	<	struct dbuf_queue buf_recvq;
192	<
193	<	struct {
194	<	unsigned int messages;      /* Statistics: protocol messages sent/received */
195	<	uint64_t bytes;             /* Statistics: total bytes sent/received */
196	<	} recv, send;
197	<
198	<	struct Listener *listener;   /* listener accepted from */
199	<	dlink_list        acceptlist; /* clients I'll allow to talk to me */
200	<	dlink_list        watches;   /* chain of Watch pointer blocks */
201	<	dlink_list        confs;     /* Configuration record associated */
202	<	dlink_list        invited;   /* chain of invite pointer blocks */
203	<	struct irc_ssaddr ip;
204	<	int               aftype;     /* Makes life easier for DNS res in IPV6 */
205	<	struct DNSQuery   *dns_query; /* result returned from resolver query */
206	<	time_t last; /* Last time we got a PRIVMSG */
207	<	time_t            last_nick_change;
208	<	int               number_of_nick_changes;
209	<
210	<	char              *passwd;
211	<	int               caps;       /* capabilities bit-field */
212	<	int               enc_caps;   /* cipher capabilities bit-field */
213	<
214	<	#ifdef HAVE_LIBCRYPTO
215	<	struct EncCapability *in_cipher;
216	<	struct EncCapability *out_cipher;
217	<
218	<	char              in_key[CIPHERKEYLEN];
219	<	char              out_key[CIPHERKEYLEN];
220	<	#endif
221	<
222	<	fde_t             fd;
223	<	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
224	<	to servlink */
225	<
226	<	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
227	<	char    *slinkq;              /* sendq for control data */
228	<	int              slinkq_ofs;  /* ofset into slinkq */
229	<	int              slinkq_len;  /* length remaining after slinkq_ofs */
230	<
231	<	struct ZipStats  zipstats;
232	<
233	<	/* Anti-flood stuff. We track how many messages were parsed and how
234	<	* many we were allowed in the current second, and apply a simple
235	<	* decay to avoid flooding.
236	<	*   -- adrian
237	<	*/
238	<	int allow_read;       /* how many we're allowed to read in this second */
239	<	int sent_parsed;      /* how many messages we've parsed in this second */
240	<	time_t last_knock;    /* time of last knock */
241	<	unsigned long random_ping;
37	>	#include "auth.h"
38
39	<	char*          response;  /* expected response from client */
244	<	char*          auth_oper; /* Operator to become if they supply the response.*/
245	<	};
39	>	struct MaskItem;
40
41		/*
42		* status macros.
43		*/
44	<	#define STAT_CONNECTING         0x01
45	<	#define STAT_HANDSHAKE          0x02
46	<	#define STAT_ME                 0x04
47	<	#define STAT_UNKNOWN            0x08
48	<	#define STAT_SERVER             0x10
49	<	#define STAT_CLIENT             0x20
50	<
51	<	#define REG_NEED_USER 0x1
52	<	#define REG_NEED_NICK 0x2
53	<	#define REG_NEED_CAP  0x4
54	<	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
55	<
56	<	#define HasID(x)                ((x)->id[0] != '\0')
263	<	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
264	<	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
44	>	#define STAT_CONNECTING  0x00000001U
45	>	#define STAT_HANDSHAKE   0x00000002U
46	>	#define STAT_ME          0x00000004U
47	>	#define STAT_UNKNOWN     0x00000008U
48	>	#define STAT_SERVER      0x00000010U
49	>	#define STAT_CLIENT      0x00000020U
50	>
51	>	#define REG_NEED_USER    0x00000001U  /**< User must send USER command */
52	>	#define REG_NEED_NICK    0x00000002U  /**< User must send NICK command */
53	>	#define REG_NEED_CAP     0x00000004U  /**< In middle of CAP negotiations */
54	>	#define REG_INIT  (REG_NEED_USER|REG_NEED_NICK)
55	>
56	>	#define ID_or_name(x,client_p)  ((IsCapable(client_p->from, CAP_TS6) && (x)->id[0]) ? (x)->id : (x)->name)
57
58		#define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
59		#define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
#	Line 271 | Line 63 | struct LocalUser
63		#define IsServer(x)             ((x)->status == STAT_SERVER)
64		#define IsClient(x)             ((x)->status == STAT_CLIENT)
65
274	–	#define IsOper(x)               ((x)->umodes & UMODE_OPER)
275	–	#define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
276	–
66		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
67	<	(x)->handler = UNREGISTERED_HANDLER; }
67	>	(x)->handler = UNREGISTERED_HANDLER; }
68
69		#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
70	<	(x)->handler = UNREGISTERED_HANDLER; }
70	>	(x)->handler = UNREGISTERED_HANDLER; }
71
72		#define SetMe(x)                {(x)->status = STAT_ME; \
73	<	(x)->handler = UNREGISTERED_HANDLER; }
73	>	(x)->handler = UNREGISTERED_HANDLER; }
74
75		#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
76	<	(x)->handler = UNREGISTERED_HANDLER; }
76	>	(x)->handler = UNREGISTERED_HANDLER; }
77
78		#define SetServer(x)            {(x)->status = STAT_SERVER; \
79	<	(x)->handler = SERVER_HANDLER; }
79	>	(x)->handler = SERVER_HANDLER; }
80
81		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
82	<	(x)->handler = IsOper((x)) ? \
83	<	OPER_HANDLER : CLIENT_HANDLER; }
82	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
83	>	OPER_HANDLER : CLIENT_HANDLER; }
84
85	<	#define SetEob(x)               ((x)->flags |= FLAGS_EOB)
86	<	#define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
85	>	#define MyConnect(x)            ((x)->connection != NULL)
86	>	#define MyClient(x)             (MyConnect(x) && IsClient(x))
87
88		/*
89		* ts stuff
90		*/
91	<	#define TS_CURRENT      6       /* current TS protocol version */
92	<	#ifdef TS5_ONLY
304	<	#define TS_MIN          5
305	<	#else
306	<	#define TS_MIN          3       /* minimum supported TS protocol version */
307	<	#endif
91	>	#define TS_CURRENT      6  /**< Current TS protocol version */
92	>	#define TS_MIN          6  /**< Minimum supported TS protocol version */
93		#define TS_DOESTS       0x20000000
94		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
95
96
97
98	<	#define CAP_MULTI_PREFIX  0x00000001
98	>	#define CAP_MULTI_PREFIX  0x00000001U
99	>	#define CAP_AWAY_NOTIFY   0x00000002U
100	>	#define CAP_UHNAMES       0x00000004U
101
102	<	/* housekeeping flags */
316	<	#define FLAGS_PINGSENT      0x00000001 /* Unreplied ping sent                      */
317	<	#define FLAGS_DEADSOCKET    0x00000002 /* Local socket is dead--Exiting soon       */
318	<	#define FLAGS_KILLED        0x00000004 /* Prevents "QUIT" from being sent for this */
319	<	#define FLAGS_CLOSING       0x00000008 /* set when closing to suppress errors      */
320	<	#define FLAGS_GOTID         0x00000010 /* successful ident lookup achieved         */
321	<	#define FLAGS_NEEDID        0x00000020 /* I-lines say must use ident return        */
322	<	#define FLAGS_SENDQEX       0x00000040 /* Sendq exceeded                           */
323	<	#define FLAGS_IPHASH        0x00000080 /* iphashed this client                     */
324	<	#define FLAGS_CRYPTIN       0x00000100 /* incoming data must be decrypted          */
325	<	#define FLAGS_CRYPTOUT      0x00000200 /* outgoing data must be encrypted          */
326	<	#define FLAGS_WAITAUTH      0x00000400 /* waiting for CRYPTLINK AUTH command       */
327	<	#define FLAGS_SERVLINK      0x00000800 /* servlink has servlink process            */
328	<	#define FLAGS_MARK          0x00001000 /* marked client                            */
329	<	#define FLAGS_CANFLOOD      0x00002000 /* client has the ability to flood          */
330	<	#define FLAGS_EXEMPTGLINE   0x00004000 /* client can't be G-lined                  */
331	<	#define FLAGS_EXEMPTKLINE   0x00008000 /* client is exempt from kline              */
332	<	#define FLAGS_NOLIMIT       0x00010000 /* client is exempt from limits             */
333	<	#define FLAGS_RESTRICTED    0x00020000 /* client cannot op others                  */
334	<	#define FLAGS_PING_COOKIE   0x00040000 /* PING Cookie                              */
335	<	#define FLAGS_IDLE_LINED    0x00080000 /* client is exempt from idle-time limits   */
336	<	#define FLAGS_IP_SPOOFING   0x00100000 /* client IP is spoofed                     */
337	<	#define FLAGS_FLOODDONE     0x00200000 /* Flood grace period has been ended.       */
338	<	#define FLAGS_EOB           0x00400000 /* server has received EOB                  */
339	<	#define FLAGS_HIDDEN        0x00800000 /* a hidden server. not shown in /links     */
340	<	#define FLAGS_BLOCKED       0x01000000 /* must wait for COMM_SELECT_WRITE          */
341	<	#define FLAGS_SBLOCKED      0x02000000 /* slinkq is blocked                        */
342	<	#define FLAGS_USERHOST      0x04000000 /* client is in userhost hash               */
343	<	#define FLAGS_BURSTED       0x08000000 /* user was already bursted                 */
344	<	#define FLAGS_EXEMPTRESV    0x10000000 /* client is exempt from RESV               */
345	<	#define FLAGS_GOTUSER       0x20000000 /* if we received a USER command            */
346	<	#define FLAGS_PINGWARNING   0x40000000 /* unreplied ping warning already sent      */
347	<	#define FLAGS_FINISHED_AUTH 0x80000000 /* Client has been released from auth       */
102	>	#define HasCap(x, y) ((x)->connection->cap_active & (y))
103
104
105	<	/* umodes, settable flags */
106	<	#define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
107	<	#define UMODE_CCONN        0x00000002 /* Client Connections */
108	<	#define UMODE_REJ          0x00000004 /* Bot Rejections */
109	<	#define UMODE_SKILL        0x00000008 /* Server Killed */
110	<	#define UMODE_FULL         0x00000010 /* Full messages */
111	<	#define UMODE_SPY          0x00000020 /* see STATS / LINKS */
112	<	#define UMODE_DEBUG        0x00000040 /* 'debugging' info */
113	<	#define UMODE_NCHANGE      0x00000080 /* Nick change notice */
114	<	#define UMODE_WALLOP       0x00000100 /* send wallops to them */
115	<	#define UMODE_OPERWALL     0x00000200 /* Operwalls */
116	<	#define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
117	<	#define UMODE_BOTS         0x00000800 /* shows bots */
118	<	#define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
119	<	#define UMODE_CALLERID     0x00002000 /* block unless caller id's */
120	<	#define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
121	<	#define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
122	<	#define UMODE_LOCOPS       0x00010000 /* show locops */
123	<	#define UMODE_DEAF         0x00020000 /* don't receive channel messages */
124	<	#define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
125	<
126	<	/* user information flags, only settable by remote mode or local oper */
127	<	#define UMODE_OPER         0x40000000 /* Operator */
128	<	#define UMODE_ADMIN        0x80000000 /* Admin on server */
105	>	/* housekeeping flags */
106	>	#define FLAGS_PINGSENT       0x00000001U  /**< Unreplied ping sent */
107	>	#define FLAGS_DEADSOCKET     0x00000002U  /**< Local socket is dead--Exiting soon */
108	>	#define FLAGS_KILLED         0x00000004U  /**< Prevents "QUIT" from being sent for this */
109	>	#define FLAGS_CLOSING        0x00000008U  /**< Set when closing to suppress errors */
110	>	#define FLAGS_GOTID          0x00000010U  /**< Successful ident lookup achieved */
111	>	#define FLAGS_NEEDID         0x00000020U  /**< auth{} block say must use ident return */
112	>	#define FLAGS_SENDQEX        0x00000040U  /**< Sendq exceeded */
113	>	#define FLAGS_IPHASH         0x00000080U  /**< Iphashed this client */
114	>	#define FLAGS_MARK           0x00000100U  /**< Marked client */
115	>	#define FLAGS_CANFLOOD       0x00000200U  /**< Client has the ability to flood */
116	>	#define FLAGS_EXEMPTGLINE    0x00000400U  /**< Client can't be G-lined */
117	>	#define FLAGS_EXEMPTKLINE    0x00000800U  /**< Client is exempt from kline */
118	>	#define FLAGS_NOLIMIT        0x00001000U  /**< Client is exempt from limits */
119	>	#define FLAGS_PING_COOKIE    0x00002000U  /**< PING Cookie */
120	>	#define FLAGS_IP_SPOOFING    0x00004000U  /**< Client IP is spoofed */
121	>	#define FLAGS_FLOODDONE      0x00008000U  /**< Flood grace period has been ended. */
122	>	#define FLAGS_EOB            0x00010000U  /**< Server has sent us an EOB */
123	>	#define FLAGS_HIDDEN         0x00020000U  /**< A hidden server. Not shown in /links */
124	>	#define FLAGS_BLOCKED        0x00040000U  /**< Must wait for COMM_SELECT_WRITE */
125	>	#define FLAGS_USERHOST       0x00080000U  /**< Client is in userhost hash */
126	>	#define FLAGS_BURSTED        0x00100000U  /**< User was already bursted */
127	>	#define FLAGS_EXEMPTRESV     0x00200000U  /**< Client is exempt from RESV */
128	>	#define FLAGS_GOTUSER        0x00400000U  /**< If we received a USER command */
129	>	#define FLAGS_FINISHED_AUTH  0x00800000U  /**< Client has been released from auth */
130	>	#define FLAGS_FLOOD_NOTICED  0x01000000U  /**< Notice to opers about this flooder has been sent */
131	>	#define FLAGS_SERVICE        0x02000000U  /**< Client/server is a network service */
132	>	#define FLAGS_AUTH_SPOOF     0x04000000U  /**< User's hostname has been spoofed by an auth{} spoof */
133	>	#define FLAGS_SSL            0x08000000U  /**< User is connected via TLS/SSL */
134	>	#define FLAGS_SQUIT          0x10000000U
135	>
136	>	#define HasFlag(x, y) ((x)->flags &   (y))
137	>	#define AddFlag(x, y) ((x)->flags |=  (y))
138	>	#define DelFlag(x, y) ((x)->flags &= ~(y))
139
375	–	#define UMODE_ALL          UMODE_SERVNOTICE
140
141	<	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
142	<	UMODE_ADMIN)
141	>
142	>	/* umodes, settable flags */
143	>	#define UMODE_SERVNOTICE   0x00000001U  /**< Server notices such as kill */
144	>	#define UMODE_CCONN        0x00000002U  /**< Client Connections */
145	>	#define UMODE_REJ          0x00000004U  /**< Bot Rejections */
146	>	#define UMODE_SKILL        0x00000008U  /**< Server Killed */
147	>	#define UMODE_FULL         0x00000010U  /**< Full messages */
148	>	#define UMODE_SPY          0x00000020U  /**< See STATS / LINKS */
149	>	#define UMODE_DEBUG        0x00000040U  /**< 'debugging' info */
150	>	#define UMODE_NCHANGE      0x00000080U  /**< Nick change notice */
151	>	#define UMODE_WALLOP       0x00000100U  /**< Send wallops to them */
152	>	#define UMODE_INVISIBLE    0x00000200U  /**< Makes user invisible */
153	>	#define UMODE_BOTS         0x00000400U  /**< Shows bots */
154	>	#define UMODE_EXTERNAL     0x00000800U  /**< Show servers introduced and splitting */
155	>	#define UMODE_CALLERID     0x00001000U  /**< Block unless caller id's */
156	>	#define UMODE_SOFTCALLERID 0x00002000U  /**< Block unless on common channel */
157	>	#define UMODE_UNAUTH       0x00004000U  /**< Show unauth connects here */
158	>	#define UMODE_LOCOPS       0x00008000U  /**< Show locops */
159	>	#define UMODE_DEAF         0x00010000U  /**< Don't receive channel messages */
160	>	#define UMODE_REGISTERED   0x00020000U  /**< User has identified for that nick. */
161	>	#define UMODE_REGONLY      0x00040000U  /**< Only registered nicks may PM */
162	>	#define UMODE_HIDDEN       0x00080000U  /**< Operator status is hidden */
163	>	#define UMODE_OPER         0x00100000U  /**< Operator */
164	>	#define UMODE_ADMIN        0x00200000U  /**< Admin on server */
165	>	#define UMODE_FARCONNECT   0x00400000U  /**< Can see remote client connects/exits */
166	>	#define UMODE_HIDDENHOST   0x00800000U  /**< User's host is hidden */
167	>	#define UMODE_SSL          0x01000000U  /**< User is connected via TLS/SSL */
168	>	#define UMODE_WEBIRC       0x02000000U  /**< User connected via a webirc gateway */
169	>	#define UMODE_HIDEIDLE     0x04000000U  /**< Hides idle and signon time in WHOIS */
170	>	#define UMODE_HIDECHANS    0x08000000U  /**< Hides channel list in WHOIS */
171	>
172	>	#define UMODE_ALL          UMODE_SERVNOTICE
173	>
174	>	#define HasUMode(x, y) ((x)->umodes &   (y))
175	>	#define AddUMode(x, y) ((x)->umodes |=  (y))
176	>	#define DelUMode(x, y) ((x)->umodes &= ~(y))
177
178
179		/* oper priv flags */
180	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
181	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
182	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
183	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
184	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
185	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
186	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
187	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
188	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
189	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
190	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
191	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
192	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
193	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
194	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
180	>	#define OPER_FLAG_KILL_REMOTE    0x00000001U  /**< Oper can KILL remote users */
181	>	#define OPER_FLAG_KILL           0x00000002U  /**< Oper can KILL local users */
182	>	#define OPER_FLAG_UNKLINE        0x00000004U  /**< Oper can use UNKLINE command */
183	>	#define OPER_FLAG_GLINE          0x00000008U  /**< Oper can use GLINE command */
184	>	#define OPER_FLAG_KLINE          0x00000010U  /**< Oper can use KLINE command */
185	>	#define OPER_FLAG_XLINE          0x00000020U  /**< Oper can use XLINE command */
186	>	#define OPER_FLAG_DIE            0x00000040U  /**< Oper can use DIE command */
187	>	#define OPER_FLAG_REHASH         0x00000080U  /**< Oper can use REHASH command */
188	>	#define OPER_FLAG_ADMIN          0x00000100U  /**< Oper can set user mode +a */
189	>	#define OPER_FLAG_REMOTEBAN      0x00000200U  /**< Oper can set remote bans */
190	>	#define OPER_FLAG_GLOBOPS        0x00000400U  /**< Oper can use GLOBOPS command */
191	>	#define OPER_FLAG_MODULE         0x00000800U  /**< Oper can use MODULE command */
192	>	#define OPER_FLAG_RESTART        0x00001000U  /**< Oper can use RESTART command */
193	>	#define OPER_FLAG_DLINE          0x00002000U  /**< Oper can use DLINE command */
194	>	#define OPER_FLAG_UNDLINE        0x00004000U  /**< Oper can use UNDLINE command */
195	>	#define OPER_FLAG_SET            0x00008000U  /**< Oper can use SET command */
196	>	#define OPER_FLAG_SQUIT          0x00010000U  /**< Oper can do local SQUIT */
197	>	#define OPER_FLAG_SQUIT_REMOTE   0x00020000U  /**< Oper can do remote SQUIT */
198	>	#define OPER_FLAG_CONNECT        0x00040000U  /**< Oper can do local CONNECT */
199	>	#define OPER_FLAG_CONNECT_REMOTE 0x00080000U  /**< Oper can do remote CONNECT */
200	>	#define OPER_FLAG_WALLOPS        0x00100000U  /**< Oper can use WALLOPS command */
201	>	#define OPER_FLAG_LOCOPS         0x00200000U  /**< Oper can use LOCOPS command */
202	>	#define OPER_FLAG_UNXLINE        0x00400000U  /**< Oper can use UNXLINE command */
203	>
204	>
205	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->connection->operflags & (y) : 0)
206	>	#define AddOFlag(x, y) ((x)->connection->operflags |=  (y))
207	>	#define DelOFlag(x, y) ((x)->connection->operflags &= ~(y))
208	>	#define ClrOFlag(x)    ((x)->connection->operflags = 0)
209
398	–	#define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
210
211
212		/* flags macros. */
213		#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
214		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
215		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
216	<	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
217	<	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
218	<	#define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
219	<	#define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
220	<	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
410	<	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
411	<	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
412	<	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
413	<	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
414	<	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
415	<	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
416	<	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
417	<	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
418	<	#define MyConnect(x)            ((x)->localClient != NULL)
419	<	#define MyClient(x)             (MyConnect(x) && IsClient(x))
420	<	#define SetMark(x)              ((x)->flags |= FLAGS_MARK)
421	<	#define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
422	<	#define IsMarked(x)             ((x)->flags & FLAGS_MARK)
423	<	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
424	<	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
425	<	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
426	<	FLAGS_KILLED))
216	>	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
217	>	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
218	>	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
219	>	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
220	>	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
221
222		/* oper flags */
223	<	#define MyOper(x)               (MyConnect(x) && IsOper(x))
223	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
224
225		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
226	<	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
226	>	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
227
228		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
229	<	if (!IsOper((x)) && !IsServer((x))) \
230	<	(x)->handler = CLIENT_HANDLER; }
229	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
230	>	(x)->handler = CLIENT_HANDLER; }
231
232	<	#define IsPrivileged(x)         (IsOper(x) || IsServer(x))
233	<
440	<	/* umode flags */
441	<	#define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
442	<	#define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
443	<	#define IsSetCallerId(x)        ((x)->umodes & \
444	<	(UMODE_CALLERID|UMODE_SOFTCALLERID))
445	<	#define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
446	<	#define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
447	<	#define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
448	<
449	<	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
450	<	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
451	<
452	<	#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
453	<	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
454	<	#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
232	>	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
233	>	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
234
235		#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
457	–	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
236		#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
237
238	<	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
239	<	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
240	<	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
463	<
464	<	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
465	<	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
466	<	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
238	>	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
239	>	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
240	>	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
241
242		#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
243		#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
#	Line 482 | Line 256 | struct LocalUser
256		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
257		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
258
485	–	#define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
486	–	#define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
487	–	#define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
488	–	#define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
489	–
259		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
260		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
261		#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
#	Line 494 | Line 263 | struct LocalUser
263		#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
264		#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
265
497	–	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
498	–	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
499	–	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
500	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
501	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
502	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
503	–
504	–	#define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
505	–	#define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
506	–	#define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
507	–
508	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
509	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
510	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
511	–
512	–	/* operflags macros */
513	–	#define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
514	–	#define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
515	–	#define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
516	–	#define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
517	–	#define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
518	–	#define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
519	–	#define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
520	–	#define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
521	–	#define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
522	–	#define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
523	–	#define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
524	–	#define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
525	–	#define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
526	–	#define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
527	–	#define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
266
267	<	/*
268	<	* definitions for get_client_name
269	<	* TBD - make this an enum
267	>	/*! \brief addr_mask_type enumeration */
268	>	enum addr_mask_type
269	>	{
270	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
271	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
272	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
273	>	};
274	>
275	>	/*! \brief Server structure */
276	>	struct Server
277	>	{
278	>	dlink_list server_list; /**< Servers on this server */
279	>	dlink_list client_list; /**< Clients on this server */
280	>	char by[NICKLEN + 1];   /**< Who activated this connection */
281	>	};
282	>
283	>	/*! \brief ListTask structure */
284	>	struct ListTask
285	>	{
286	>	dlink_list show_mask; /**< Channels to show */
287	>	dlink_list hide_mask; /**< Channels to hide */
288	>
289	>	unsigned int hash_index; /**< The hash bucket we are currently in */
290	>	unsigned int users_min;
291	>	unsigned int users_max;
292	>	unsigned int created_min;
293	>	unsigned int created_max;
294	>	unsigned int topicts_min;
295	>	unsigned int topicts_max;
296	>	char topic[TOPICLEN + 1];
297	>	};
298	>
299	>	/*! \brief Connection structure
300	>	*
301	>	* Allocated only for local clients, that are directly connected
302	>	* to \b this server with a socket.
303		*/
304	<	#define HIDE_IP 0
305	<	#define SHOW_IP 1
306	<	#define MASK_IP 2
304	>	struct Connection
305	>	{
306	>	dlink_node   lclient_node;
307	>
308	>	unsigned int registration;
309	>	unsigned int cap_client;  /**< Client capabilities (from us) */
310	>	unsigned int cap_active;  /**< Active capabilities (to us) */
311	>	unsigned int       caps;  /**< Capabilities bit-field */
312	>
313	>	unsigned int operflags;     /**< IRC Operator privilege flags */
314	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
315	>
316	>	unsigned int serial;     /**< Used to enforce 1 send per nick */
317	>
318	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
319	>	time_t       firsttime;  /**< Time client was created */
320	>	time_t       since;      /**< Last time we parsed something */
321	>	time_t       last_join_time;   /**< When this client last joined a channel */
322	>	time_t       last_leave_time;  /**< When this client last left a channel */
323	>	int          join_leave_count; /**< Count of JOIN/LEAVE in less than
324	>	MIN_JOIN_LEAVE_TIME seconds */
325	>	int          oper_warn_count_down; /**< Warn opers of this possible
326	>	spambot every time this gets to 0 */
327	>	time_t       last_caller_id_time;
328	>	time_t       first_received_message_time;
329	>	time_t       last_privmsg;  /**< Last time we got a PRIVMSG */
330	>
331	>	int          received_number_of_privmsgs;
332	>
333	>	struct ListTask  *list_task;
334	>
335	>	struct dbuf_queue buf_sendq;
336	>	struct dbuf_queue buf_recvq;
337	>
338	>	struct
339	>	{
340	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
341	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
342	>	} recv, send;
343	>
344	>	struct
345	>	{
346	>	unsigned int count;  /**< How many AWAY/INVITE/KNOCK/NICK requests client has sent */
347	>	time_t last_attempt;  /**< Last time the AWAY/INVITE/KNOCK/NICK request was issued */
348	>	} away, invite, knock, nick;
349	>
350	>	struct AuthRequest auth;
351	>	struct Listener *listener;   /**< Listener accepted from */
352	>	dlink_list        acceptlist; /**< Clients I'll allow to talk to me */
353	>	dlink_list        watches;   /**< Chain of Watch pointer blocks */
354	>	dlink_list        confs;     /**< Configuration record associated */
355	>	dlink_list        invited;   /**< Chain of invite pointer blocks */
356	>	struct irc_ssaddr ip;
357	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
358	>	int               country_id; /**< ID corresponding to a ISO 3166 country code */
359	>
360	>	fde_t             fd;
361	>
362	>	/* Anti-flood stuff. We track how many messages were parsed and how
363	>	* many we were allowed in the current second, and apply a simple
364	>	* decay to avoid flooding.
365	>	*   -- adrian
366	>	*/
367	>	int allow_read;       /**< How many we're allowed to read in this second */
368	>	int sent_parsed;      /**< How many messages we've parsed in this second */
369	>
370	>	char *password;  /**< Password supplied by the client/server */
371	>	char *challenge_response;  /**< Expected CHALLENGE response from client */
372	>	char *challenge_operator;  /**< Operator to become if they supply the response */
373	>	};
374	>
375	>	/*! \brief Client structure */
376	>	struct Client
377	>	{
378	>	dlink_node node;
379	>	dlink_node lnode;             /**< Used for Server->servers/users */
380	>
381	>	struct Connection *connection;
382	>	struct Client    *hnext;      /**< For client hash table lookups by name */
383	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
384	>	struct Server    *serv;       /**< ...defined, if this is a server */
385	>	struct Client    *servptr;    /**< Points to server this Client is on */
386	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
387	>
388	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
389	>
390	>	unsigned int      flags;      /**< Client flags */
391	>	unsigned int      umodes;     /**< Opers, normal users subset */
392	>	unsigned int      hopcount;   /**< Number of servers to this 0 = local */
393	>	unsigned int      status;     /**< Client type */
394	>	unsigned int      handler;    /**< Handler index */
395	>
396	>	dlink_list        whowas;
397	>	dlink_list        channel;   /**< Chain of channel pointer blocks */
398	>
399	>	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
400	>	char name[HOSTLEN + 1]; /**< Unique name for a client nick or host */
401	>	char svid[SVIDLEN + 1]; /**< Services ID */
402	>	char id[IDLEN + 1];       /**< Client ID, unique ID per client */
403	>
404	>	/*
405	>	* client->username is the username from ident or the USER message,
406	>	* If the client is idented the USER message is ignored, otherwise
407	>	* the username part of the USER message is put here prefixed with a
408	>	* tilde depending on the auth{} block. Once a client has registered,
409	>	* this field should be considered read-only.
410	>	*/
411	>	char              username[USERLEN + 1]; /* client's username */
412	>
413	>	/*
414	>	* client->host contains the resolved name or ip address
415	>	* as a string for the user, it may be fiddled with for oper spoofing etc.
416	>	* once it's changed the *real* address goes away. This should be
417	>	* considered a read-only field after the client has registered.
418	>	*/
419	>	char              host[HOSTLEN + 1];     /* client's hostname */
420	>
421	>	/*
422	>	* client->info for unix clients will normally contain the info from the
423	>	* gcos field in /etc/passwd but anything can go here.
424	>	*/
425	>	char              info[REALLEN + 1]; /* Free form additional client info */
426	>
427	>	/*
428	>	* client->sockhost contains the ip address gotten from the socket as a
429	>	* string, this field should be considered read-only once the connection
430	>	* has been made. (set in s_bsd.c only)
431	>	*/
432	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
433	>	socket ip address as string */
434	>	char             *certfp;
435	>	};
436	>
437
438		extern struct Client me;
439		extern dlink_list listing_client_list;
440		extern dlink_list global_client_list;
441	+	extern dlink_list global_server_list;   /* global servers on the network              */
442	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
443	+	extern dlink_list local_server_list;  /* local servers to this server ONLY          */
444	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
445	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
446
447		extern int accept_message(struct Client *, struct Client *);
448	+	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
449		extern struct split_nuh_item *find_accept(const char *, const char *,
450	<	const char *, struct Client *, int);
450	>	const char *, struct Client *,
451	>	int (*)(const char *, const char *));
452		extern void del_accept(struct split_nuh_item *, struct Client *);
453		extern void del_all_accepts(struct Client *);
454	<	extern void set_initial_nick(struct Client *, struct Client *, const char *);
455	<	extern void exit_client(struct Client *, struct Client *, const char *);
454	>	extern void exit_client(struct Client *, const char *);
455	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
456		extern void check_conf_klines(void);
457	<	extern void init_client(void);
550	<	extern void change_local_nick(struct Client *, struct Client *, const char *);
457	>	extern void client_init(void);
458		extern void dead_link_on_write(struct Client *, int);
459		extern void dead_link_on_read(struct Client *, int);
460		extern void exit_aborted_clients(void);
461		extern void free_exited_clients(void);
462		extern struct Client *make_client(struct Client *);
463	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
463	>	extern struct Client *find_chasing(struct Client *, const char *);
464		extern struct Client *find_person(const struct Client *const, const char *);
465	<	extern const char *get_client_name(struct Client *, int);
465	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
466
467		#endif /* INCLUDED_client_h */

Diff Legend

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