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 982 by michael, Thu Aug 13 22:15:08 2009 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 3312 by michael, Tue Apr 15 12:13: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 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 "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"
37	>	#include "s_auth.h"
38
39	<	#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	<	uint64_t in;
73	<	uint64_t in_wire;
74	<	uint64_t out;
75	<	uint64_t 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	<
108	<	unsigned int      umodes;     /* opers, normal users subset */
109	<	uint64_t          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 int      serial;     /* used to enforce 1 send per nick */
115	<	char *away;
116	<
117	<	/*
118	<	* client->name is the unique name for a client nick or host
119	<	*/
120	<	char name[HOSTLEN + 1];
121	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
122	<
123	<	/*
124	<	* client->username is the username from ident or the USER message,
125	<	* If the client is idented the USER message is ignored, otherwise
126	<	* the username part of the USER message is put here prefixed with a
127	<	* tilde depending on the I:line, Once a client has registered, this
128	<	* field should be considered read-only.
129	<	*/
130	<	char              username[USERLEN + 1]; /* client's username */
131	<
132	<	/*
133	<	* client->host contains the resolved name or ip address
134	<	* as a string for the user, it may be fiddled with for oper spoofing etc.
135	<	* once it's changed the *real* address goes away. This should be
136	<	* considered a read-only field after the client has registered.
137	<	*/
138	<	char              host[HOSTLEN + 1];     /* client's hostname */
139	<
140	<	/*
141	<	* client->info for unix clients will normally contain the info from the
142	<	* gcos field in /etc/passwd but anything can go here.
143	<	*/
144	<	char              info[REALLEN + 1]; /* Free form additional client info */
145	<	char              client_host[HOSTLEN + 1];
146	<	char              client_server[HOSTLEN + 1];
147	<
148	<	/* client->sockhost contains the ip address gotten from the socket as a
149	<	* string, this field should be considered read-only once the connection
150	<	* has been made. (set in s_bsd.c only)
151	<	*/
152	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
153	<	socket ip address as string */
154	<	dlink_list        channel;   /* chain of channel pointer blocks */
155	<
156	<	struct LocalUser *localClient;
157	<	};
158	<
159	<	struct LocalUser
160	<	{
161	<	/*
162	<	* The following fields are allocated only for local clients
163	<	* (directly connected to *this* server with a socket.
164	<	*/
165	<	dlink_node        lclient_node;
166	<
167	<
168	<
169	<	unsigned int registration;
170	<	unsigned int cap_client;    /* Client capabilities (from us) */
171	<	unsigned int cap_active;    /* Active capabilities (to us) */
172	<
173	<	unsigned int operflags;     /* oper priv flags */
174	<	unsigned int random_ping;
175	<
176	<
177	<	/* Anti flooding part, all because of lamers... */
178	<	time_t            last_away; /* Away since... */
179	<	time_t            last_join_time;   /* when this client last
180	<	joined a channel */
181	<	time_t            last_leave_time;  /* when this client last
182	<	* left a channel */
183	<	int               join_leave_count; /* count of JOIN/LEAVE in less than
184	<	MIN_JOIN_LEAVE_TIME seconds */
185	<	int               oper_warn_count_down; /* warn opers of this possible
186	<	spambot every time this gets to 0 */
187	<	time_t            reject_delay;
188	<	time_t            last_caller_id_time;
189	<	time_t            first_received_message_time;
190	<	time_t            last_nick_change;
191	<
192	<	int               received_number_of_privmsgs;
193	<	unsigned int      number_of_nick_changes;
194	<
195	<	struct ListTask   *list_task;
196	<	/* Send and receive dbufs .. */
197	<	struct dbuf_queue buf_sendq;
198	<	struct dbuf_queue buf_recvq;
199	<
200	<	struct {
201	<	unsigned int messages;      /* Statistics: protocol messages sent/received */
202	<	uint64_t bytes;             /* Statistics: total bytes sent/received */
203	<	} recv, send;
204	<
205	<	struct Listener *listener;   /* listener accepted from */
206	<	dlink_list        acceptlist; /* clients I'll allow to talk to me */
207	<	dlink_list        watches;   /* chain of Watch pointer blocks */
208	<	dlink_list        confs;     /* Configuration record associated */
209	<	dlink_list        invited;   /* chain of invite pointer blocks */
210	<	struct irc_ssaddr ip;
211	<	int               aftype;     /* Makes life easier for DNS res in IPV6 */
212	<	struct DNSQuery   *dns_query; /* result returned from resolver query */
213	<	time_t last; /* Last time we got a PRIVMSG */
214	<
215	<	char              *passwd;
216	<	int               caps;       /* capabilities bit-field */
217	<	int               enc_caps;   /* cipher capabilities bit-field */
218	<
219	<	#ifdef HAVE_LIBCRYPTO
220	<	struct EncCapability *in_cipher;
221	<	struct EncCapability *out_cipher;
222	<
223	<	char              in_key[CIPHERKEYLEN];
224	<	char              out_key[CIPHERKEYLEN];
225	<	#endif
226	<
227	<	fde_t             fd;
228	<	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
229	<	to servlink */
230	<
231	<	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
232	<	char    *slinkq;              /* sendq for control data */
233	<	int              slinkq_ofs;  /* ofset into slinkq */
234	<	int              slinkq_len;  /* length remaining after slinkq_ofs */
235	<
236	<	struct ZipStats  zipstats;
237	<
238	<	/* Anti-flood stuff. We track how many messages were parsed and how
239	<	* many we were allowed in the current second, and apply a simple
240	<	* decay to avoid flooding.
241	<	*   -- adrian
242	<	*/
243	<	int allow_read;       /* how many we're allowed to read in this second */
244	<	int sent_parsed;      /* how many messages we've parsed in this second */
245	<	time_t last_knock;    /* time of last knock */
246	<
247	<	char*          response;  /* expected response from client */
248	<	char*          auth_oper; /* Operator to become if they supply the response.*/
249	<	};
39	>	struct MaskItem;
40
41		/*
42		* status macros.
#	Line 263 | Line 53 | struct LocalUser
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')
267	<	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
268	<	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
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 275 | Line 63 | struct LocalUser
63		#define IsServer(x)             ((x)->status == STAT_SERVER)
64		#define IsClient(x)             ((x)->status == STAT_CLIENT)
65
278	–	#define IsOper(x)               ((x)->umodes & UMODE_OPER)
279	–	#define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
280	–
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)->localClient != 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
308	<	#define TS_MIN          5
309	<	#else
310	<	#define TS_MIN          3       /* minimum supported TS protocol version */
311	<	#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
99	+	#define CAP_AWAY_NOTIFY   0x00000002
100	+	#define CAP_UHNAMES       0x00000004
101	+
102	+	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
103	+
104
105		/* housekeeping flags */
106	<	#define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
107	<	#define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
108	<	#define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
109	<	#define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
110	<	#define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
111	<	#define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
112	<	#define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
113	<	#define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
114	<	#define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
115	<	#define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
116	<	#define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
117	<	#define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
118	<	#define FLAGS_MARK          0x0000000000001000 /* marked client                            */
119	<	#define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
120	<	#define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
121	<	#define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
122	<	#define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
123	<	#define FLAGS_RESTRICTED    0x0000000000020000 /* client cannot op others                  */
124	<	#define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
125	<	#define FLAGS_IDLE_LINED    0x0000000000080000 /* client is exempt from idle-time limits   */
126	<	#define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
127	<	#define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
128	<	#define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
129	<	#define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
130	<	#define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
131	<	#define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
132	<	#define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
133	<	#define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
134	<	#define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
135	<	#define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
136	<	#define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
137	<	#define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
138	<	#define FLAGS_FLOOD_NOTICED 0x0000000100000000
106	>	#define FLAGS_PINGSENT       0x00000001 /**< Unreplied ping sent */
107	>	#define FLAGS_DEADSOCKET     0x00000002 /**< Local socket is dead--Exiting soon */
108	>	#define FLAGS_KILLED         0x00000004 /**< Prevents "QUIT" from being sent for this */
109	>	#define FLAGS_CLOSING        0x00000008 /**< set when closing to suppress errors */
110	>	#define FLAGS_GOTID          0x00000010 /**< successful ident lookup achieved */
111	>	#define FLAGS_NEEDID         0x00000020 /**< auth{} block say must use ident return */
112	>	#define FLAGS_SENDQEX        0x00000040 /**< Sendq exceeded */
113	>	#define FLAGS_IPHASH         0x00000080 /**< iphashed this client */
114	>	#define FLAGS_MARK           0x00000100 /**< marked client */
115	>	#define FLAGS_CANFLOOD       0x00000200 /**< client has the ability to flood */
116	>	#define FLAGS_EXEMPTGLINE    0x00000400 /**< client can't be G-lined */
117	>	#define FLAGS_EXEMPTKLINE    0x00000800 /**< client is exempt from kline */
118	>	#define FLAGS_NOLIMIT        0x00001000 /**< client is exempt from limits */
119	>	#define FLAGS_PING_COOKIE    0x00002000 /**< PING Cookie */
120	>	#define FLAGS_IP_SPOOFING    0x00004000 /**< client IP is spoofed */
121	>	#define FLAGS_FLOODDONE      0x00008000 /**< Flood grace period has been ended. */
122	>	#define FLAGS_EOB            0x00010000 /**< server has sent us an EOB */
123	>	#define FLAGS_HIDDEN         0x00020000 /**< a hidden server. not shown in /links */
124	>	#define FLAGS_BLOCKED        0x00040000 /**< must wait for COMM_SELECT_WRITE */
125	>	#define FLAGS_USERHOST       0x00080000 /**< client is in userhost hash */
126	>	#define FLAGS_BURSTED        0x00100000 /**< user was already bursted */
127	>	#define FLAGS_EXEMPTRESV     0x00200000 /**< client is exempt from RESV */
128	>	#define FLAGS_GOTUSER        0x00400000 /**< if we received a USER command */
129	>	#define FLAGS_FINISHED_AUTH  0x00800000 /**< Client has been released from auth */
130	>	#define FLAGS_FLOOD_NOTICED  0x01000000 /**< Notice to opers about this flooder has been sent */
131	>	#define FLAGS_SERVICE        0x02000000 /**< Client/server is a network service */
132	>	#define FLAGS_AUTH_SPOOF     0x04000000 /**< user's hostname has been spoofed by an auth{} spoof*/
133	>	#define FLAGS_SSL            0x08000000 /**< User is connected via TLS/SSL */
134	>	#define FLAGS_SQUIT          0x10000000
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
140
355	–	/* umodes, settable flags */
356	–	#define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
357	–	#define UMODE_CCONN        0x00000002 /* Client Connections */
358	–	#define UMODE_REJ          0x00000004 /* Bot Rejections */
359	–	#define UMODE_SKILL        0x00000008 /* Server Killed */
360	–	#define UMODE_FULL         0x00000010 /* Full messages */
361	–	#define UMODE_SPY          0x00000020 /* see STATS / LINKS */
362	–	#define UMODE_DEBUG        0x00000040 /* 'debugging' info */
363	–	#define UMODE_NCHANGE      0x00000080 /* Nick change notice */
364	–	#define UMODE_WALLOP       0x00000100 /* send wallops to them */
365	–	#define UMODE_OPERWALL     0x00000200 /* Operwalls */
366	–	#define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
367	–	#define UMODE_BOTS         0x00000800 /* shows bots */
368	–	#define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
369	–	#define UMODE_CALLERID     0x00002000 /* block unless caller id's */
370	–	#define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
371	–	#define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
372	–	#define UMODE_LOCOPS       0x00010000 /* show locops */
373	–	#define UMODE_DEAF         0x00020000 /* don't receive channel messages */
374	–	#define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
375	–
376	–	/* user information flags, only settable by remote mode or local oper */
377	–	#define UMODE_OPER         0x40000000 /* Operator */
378	–	#define UMODE_ADMIN        0x80000000 /* Admin on server */
141
142	<	#define UMODE_ALL          UMODE_SERVNOTICE
142	>	/* umodes, settable flags */
143	>	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
144	>	#define UMODE_CCONN        0x00000002 /**< Client Connections */
145	>	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
146	>	#define UMODE_SKILL        0x00000008 /**< Server Killed */
147	>	#define UMODE_FULL         0x00000010 /**< Full messages */
148	>	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
149	>	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
150	>	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
151	>	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
152	>	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
153	>	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
154	>	#define UMODE_BOTS         0x00000800 /**< shows bots */
155	>	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
156	>	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
157	>	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
158	>	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
159	>	#define UMODE_LOCOPS       0x00010000 /**< show locops */
160	>	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
161	>	#define UMODE_REGISTERED   0x00040000 /**< User has identified for that nick. */
162	>	#define UMODE_REGONLY      0x00080000 /**< Only registered nicks may PM */
163	>	#define UMODE_HIDDEN       0x00100000 /**< Operator status is hidden */
164	>	#define UMODE_OPER         0x00200000 /**< Operator */
165	>	#define UMODE_ADMIN        0x00400000 /**< Admin on server */
166	>	#define UMODE_FARCONNECT   0x00800000 /**< Can see remote client connects/exits */
167	>	#define UMODE_HIDDENHOST   0x01000000 /**< User's host is hidden */
168	>	#define UMODE_SSL          0x02000000 /**< User is connected via TLS/SSL */
169	>	#define UMODE_WEBIRC       0x04000000 /**< User connected via a webirc gateway */
170	>
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	>	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
179	>	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
180	>	UMODE_HIDDEN | UMODE_HIDDENHOST | UMODE_SSL |\
181	>	UMODE_WEBIRC | UMODE_CALLERID | UMODE_SOFTCALLERID)
182
382	–	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
383	–	UMODE_ADMIN)
183
184
185		/* oper priv flags */
186	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
187	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
188	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
189	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
190	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
191	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
192	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
193	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
194	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
195	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
196	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
197	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
198	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
199	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
200	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
186	>	#define OPER_FLAG_KILL_REMOTE    0x00000001 /**< Oper can global KILL */
187	>	#define OPER_FLAG_KILL           0x00000002 /**< Oper can do local KILL */
188	>	#define OPER_FLAG_UNKLINE        0x00000004 /**< Oper can use unkline*/
189	>	#define OPER_FLAG_GLINE          0x00000008 /**< Oper can use gline */
190	>	#define OPER_FLAG_K              0x00000010 /**< Oper can kline */
191	>	#define OPER_FLAG_XLINE          0x00000020 /**< Oper can xline */
192	>	#define OPER_FLAG_DIE            0x00000040 /**< Oper can die*/
193	>	#define OPER_FLAG_REHASH         0x00000080 /**< Oper can rehash */
194	>	#define OPER_FLAG_ADMIN          0x00000100 /**< Oper can set umode +a*/
195	>	#define OPER_FLAG_OPERWALL       0x00000200 /**< Oper can use OPERWALL command */
196	>	#define OPER_FLAG_REMOTEBAN      0x00000400 /**< Oper can set remote bans */
197	>	#define OPER_FLAG_GLOBOPS        0x00000800 /**< Oper can use GLOBOPS command */
198	>	#define OPER_FLAG_MODULE         0x00001000 /**< Oper can use MODULE commands */
199	>	#define OPER_FLAG_RESTART        0x00002000 /**< Oper can use RESTART command */
200	>	#define OPER_FLAG_DLINE          0x00004000 /**< Oper can use DLINE command   */
201	>	#define OPER_FLAG_UNDLINE        0x00008000 /**< Oper can use UNDLINE command */
202	>	#define OPER_FLAG_SET            0x00010000 /**< Oper can use SET command */
203	>	#define OPER_FLAG_SQUIT          0x00020000 /**< Oper can do local SQUIT */
204	>	#define OPER_FLAG_SQUIT_REMOTE   0x00040000 /**< Oper can do global SQUIT */
205	>	#define OPER_FLAG_CONNECT        0x00080000 /**< Oper can do local CONNECT */
206	>	#define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
207	>	#define OPER_FLAG_WALLOPS        0x00200000 /**< Oper can do WALLOPS */
208	>	#define OPER_FLAG_LOCOPS         0x00400000 /**< Oper can do LOCOPS */
209	>	#define OPER_FLAG_UNXLINE        0x00800000 /**< Oper can unxline*/
210	>
211	>
212	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
213	>	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
214	>	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
215	>	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
216
403	–	#define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
217
218
219		/* flags macros. */
407	–	#define IsMsgFloodNoticed(x)       ((x)->flags & FLAGS_FLOOD_NOTICED)
408	–	#define SetMsgFloodNoticed(x)      ((x)->flags |= FLAGS_FLOOD_NOTICED)
409	–	#define ClearMsgFloodNoticed(x)    ((x)->flags &= ~FLAGS_FLOOD_NOTICED)
220		#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
221		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
222		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
223	<	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
224	<	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
225	<	#define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
226	<	#define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
227	<	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
418	<	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
419	<	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
420	<	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
421	<	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
422	<	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
423	<	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
424	<	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
425	<	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
426	<	#define MyConnect(x)            ((x)->localClient != NULL)
427	<	#define MyClient(x)             (MyConnect(x) && IsClient(x))
428	<	#define SetMark(x)              ((x)->flags |= FLAGS_MARK)
429	<	#define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
430	<	#define IsMarked(x)             ((x)->flags & FLAGS_MARK)
431	<	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
432	<	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
433	<	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
434	<	FLAGS_KILLED))
223	>	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
224	>	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
225	>	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
226	>	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
227	>	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
228
229		/* oper flags */
230	<	#define MyOper(x)               (MyConnect(x) && IsOper(x))
230	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
231
232		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
233	<	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
233	>	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
234
235		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
236	<	if (!IsOper((x)) && !IsServer((x))) \
237	<	(x)->handler = CLIENT_HANDLER; }
236	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
237	>	(x)->handler = CLIENT_HANDLER; }
238
239	<	#define IsPrivileged(x)         (IsOper(x) || IsServer(x))
240	<
448	<	/* umode flags */
449	<	#define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
450	<	#define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
451	<	#define IsSetCallerId(x)        ((x)->umodes & \
452	<	(UMODE_CALLERID|UMODE_SOFTCALLERID))
453	<	#define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
454	<	#define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
455	<	#define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
456	<
457	<	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
458	<	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
239	>	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
240	>	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
241
242		#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
243		#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
#	Line 465 | Line 247 | struct LocalUser
247		#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
248		#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
249
250	<	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
251	<	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
252	<	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
471	<
472	<	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
473	<	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
474	<	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
250	>	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
251	>	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
252	>	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
253
254		#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
255		#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
#	Line 489 | Line 267 | struct LocalUser
267		#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
268		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
269		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
270	<
493	<	#define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
494	<	#define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
495	<	#define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
496	<	#define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
270	>	#define DelIPSpoof(x)           ((x)->flags &= ~FLAGS_IP_SPOOFING)
271
272		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
273		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
#	Line 502 | Line 276 | struct LocalUser
276		#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
277		#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
278
505	–	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
506	–	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
507	–	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
508	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
509	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
510	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
511	–
512	–	#define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
513	–	#define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
514	–	#define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
515	–
516	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
517	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
518	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
519	–
520	–	/* operflags macros */
521	–	#define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
522	–	#define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
523	–	#define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
524	–	#define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
525	–	#define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
526	–	#define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
527	–	#define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
528	–	#define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
529	–	#define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
530	–	#define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
531	–	#define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
532	–	#define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
533	–	#define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
534	–	#define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
535	–	#define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
279
280	<	/*
281	<	* definitions for get_client_name
282	<	* TBD - make this an enum
280	>	/*! \brief addr_mask_type enumeration */
281	>	enum addr_mask_type
282	>	{
283	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
284	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
285	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
286	>	};
287	>
288	>	/*! \brief Server structure */
289	>	struct Server
290	>	{
291	>	dlink_list server_list; /**< Servers on this server */
292	>	dlink_list client_list; /**< Clients on this server */
293	>	char by[NICKLEN + 1];   /**< Who activated this connection */
294	>	};
295	>
296	>	/*! \brief ListTask structure */
297	>	struct ListTask
298	>	{
299	>	dlink_list show_mask; /**< Channels to show */
300	>	dlink_list hide_mask; /**< Channels to hide */
301	>
302	>	unsigned int hash_index; /**< The hash bucket we are currently in */
303	>	unsigned int users_min;
304	>	unsigned int users_max;
305	>	unsigned int created_min;
306	>	unsigned int created_max;
307	>	unsigned int topicts_min;
308	>	unsigned int topicts_max;
309	>	};
310	>
311	>	/*! \brief LocalUser structure
312	>	*
313	>	* Allocated only for local clients, that are directly connected
314	>	* to \b this server with a socket.
315		*/
316	<	#define HIDE_IP 0
317	<	#define SHOW_IP 1
318	<	#define MASK_IP 2
316	>	struct LocalUser
317	>	{
318	>	dlink_node   lclient_node;
319	>
320	>	unsigned int registration;
321	>	unsigned int cap_client;    /**< Client capabilities (from us) */
322	>	unsigned int cap_active;    /**< Active capabilities (to us) */
323	>	unsigned int       caps;       /**< capabilities bit-field */
324	>
325	>	unsigned int operflags;     /**< IRC Operator privilege flags */
326	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
327	>
328	>	unsigned int serial;     /**< used to enforce 1 send per nick */
329	>
330	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
331	>	time_t       firsttime;  /**< time client was created */
332	>	time_t       since;      /**< last time we parsed something */
333	>	time_t       last_knock;    /**< time of last knock */
334	>	time_t       last_join_time;   /**< when this client last
335	>	joined a channel */
336	>	time_t       last_leave_time;  /**< when this client last
337	>	* left a channel */
338	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
339	>	MIN_JOIN_LEAVE_TIME seconds */
340	>	int          oper_warn_count_down; /**< warn opers of this possible
341	>	spambot every time this gets to 0 */
342	>	time_t       last_caller_id_time;
343	>	time_t       first_received_message_time;
344	>	time_t       last_nick_change;
345	>	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
346	>	time_t       last_away; /**< Away since... */
347	>
348	>	int          received_number_of_privmsgs;
349	>	unsigned int number_of_nick_changes;
350	>
351	>	struct ListTask  *list_task;
352	>
353	>	struct dbuf_queue buf_sendq;
354	>	struct dbuf_queue buf_recvq;
355	>
356	>	struct {
357	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
358	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
359	>	} recv, send;
360	>
361	>	struct AuthRequest auth;
362	>	struct Listener *listener;   /**< listener accepted from */
363	>	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
364	>	dlink_list        watches;   /**< chain of Watch pointer blocks */
365	>	dlink_list        confs;     /**< Configuration record associated */
366	>	dlink_list        invited;   /**< chain of invite pointer blocks */
367	>	struct irc_ssaddr ip;
368	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
369	>	int               country_id; /**< ID corresponding to a ISO 3166 country code */
370	>
371	>	char              *passwd;
372	>	fde_t             fd;
373	>	/* Anti-flood stuff. We track how many messages were parsed and how
374	>	* many we were allowed in the current second, and apply a simple
375	>	* decay to avoid flooding.
376	>	*   -- adrian
377	>	*/
378	>	int allow_read;       /**< how many we're allowed to read in this second */
379	>	int sent_parsed;      /**< how many messages we've parsed in this second */
380	>
381	>	char*          response;  /**< expected response from client */
382	>	char*          auth_oper; /**< Operator to become if they supply the response.*/
383	>	};
384	>
385	>	/*! \brief Client structure */
386	>	struct Client
387	>	{
388	>	dlink_node node;
389	>	dlink_node lnode;             /**< Used for Server->servers/users */
390	>
391	>	struct LocalUser *localClient;
392	>	struct Client    *hnext;      /**< For client hash table lookups by name */
393	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
394	>	struct Server    *serv;       /**< ...defined, if this is a server */
395	>	struct Client    *servptr;    /**< Points to server this Client is on */
396	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
397	>
398	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
399	>
400	>	unsigned int      flags;      /**< client flags */
401	>	unsigned int      umodes;     /**< opers, normal users subset */
402	>	unsigned int      hopcount;   /**< number of servers to this 0 = local */
403	>	unsigned int      status;     /**< Client type */
404	>	unsigned int      handler;    /**< Handler index */
405	>
406	>	dlink_list        whowas;
407	>	dlink_list        channel;   /**< chain of channel pointer blocks */
408	>
409	>	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
410	>	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
411	>	char svid[SVIDLEN + 1]; /**< Services ID. */
412	>	char id[IDLEN + 1];       /**< client ID, unique ID per client */
413	>	/*
414	>	* client->username is the username from ident or the USER message,
415	>	* If the client is idented the USER message is ignored, otherwise
416	>	* the username part of the USER message is put here prefixed with a
417	>	* tilde depending on the auth{} block. Once a client has registered,
418	>	* this field should be considered read-only.
419	>	*/
420	>	char              username[USERLEN + 1]; /* client's username */
421	>	/*
422	>	* client->host contains the resolved name or ip address
423	>	* as a string for the user, it may be fiddled with for oper spoofing etc.
424	>	* once it's changed the *real* address goes away. This should be
425	>	* considered a read-only field after the client has registered.
426	>	*/
427	>	char              host[HOSTLEN + 1];     /* client's hostname */
428	>
429	>	/*
430	>	* client->info for unix clients will normally contain the info from the
431	>	* gcos field in /etc/passwd but anything can go here.
432	>	*/
433	>	char              info[REALLEN + 1]; /* Free form additional client info */
434	>
435	>	/*
436	>	* client->sockhost contains the ip address gotten from the socket as a
437	>	* string, this field should be considered read-only once the connection
438	>	* has been made. (set in s_bsd.c only)
439	>	*/
440	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
441	>	socket ip address as string */
442	>	char             *certfp;
443	>	};
444	>
445
446		extern struct Client me;
447		extern dlink_list listing_client_list;
448		extern dlink_list global_client_list;
449	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
450	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
451	+	extern dlink_list serv_list;          /* local servers to this server ONLY          */
452	+	extern dlink_list global_serv_list;   /* global servers on the network              */
453	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
454
455		extern int accept_message(struct Client *, struct Client *);
456	+	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
457		extern struct split_nuh_item *find_accept(const char *, const char *,
458	<	const char *, struct Client *, int);
458	>	const char *, struct Client *,
459	>	int (*)(const char *, const char *));
460		extern void del_accept(struct split_nuh_item *, struct Client *);
461		extern void del_all_accepts(struct Client *);
462	<	extern void set_initial_nick(struct Client *, struct Client *, const char *);
463	<	extern void exit_client(struct Client *, struct Client *, const char *);
462	>	extern void exit_client(struct Client *, const char *);
463	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
464		extern void check_conf_klines(void);
465	<	extern void init_client(void);
558	<	extern void change_local_nick(struct Client *, struct Client *, const char *);
465	>	extern void client_init(void);
466		extern void dead_link_on_write(struct Client *, int);
467		extern void dead_link_on_read(struct Client *, int);
468		extern void exit_aborted_clients(void);
469		extern void free_exited_clients(void);
470		extern struct Client *make_client(struct Client *);
471	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
471	>	extern struct Client *find_chasing(struct Client *, const char *);
472		extern struct Client *find_person(const struct Client *const, const char *);
473	<	extern const char *get_client_name(struct Client *, int);
473	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
474
475		#endif /* INCLUDED_client_h */

Diff Legend

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